1. 16 Jun, 2014 4 commits
  2. 14 Jun, 2014 4 commits
    • Marcus D. Hanwell's avatar
      Very judicious use of sed, vtkOpenGL2* -> vtkOpenGL* · a6a584b1
      Marcus D. Hanwell authored
      This now gives us a vtkRenderingOpenGL2 that has most of the same
      classes as vtkRenderingOpenGL - the two will clobber each other's
      headers, symbols etc and so can never be built/linked at the same
      time.
      
      Unfortunately a lot of classes SafeDownCast or dynamic_cast to the
      derived OpenGL forms of the classes in vtkRenderingCore, and so
      using a different class name presented significant issues despite
      the fact that these classes are (in an ideal world) implementations
      of the API in vtkRenderingCore for OpenGL 2.1 and above.
      
      Change-Id: Ie8c6234621e550d3fd67da732d2cf4839290d665
      a6a584b1
    • Marcus D. Hanwell's avatar
      Rename vtkOpenGL2* -> vtkOpenGL* · b40b181d
      Marcus D. Hanwell authored
      Using pure renames to make things clearer to git...
      
      Change-Id: Icbf5f782179a5e511aee06e7a1fa494be0a5be26
      b40b181d
    • Marcus D. Hanwell's avatar
      The PainterDeviceAdaptor is abstract, can be NULL · c2a47925
      Marcus D. Hanwell authored
      Check it for NULL before deleting it, in the case of the new
      rendering code no override is provided and this is NULL.
      
      Change-Id: If57757125472481eb0a1bfd172af404d849317ff
      c2a47925
    • Marcus D. Hanwell's avatar
      Made vtkRenderingOpenGL2 independent of vtkRenderingOpenGL · 8bc98a02
      Marcus D. Hanwell authored
      This required several classes to be copied over, they may not stay.
      It also required me to port many calls from vtkgl to GLEW, and get
      rid of checks for features in OpenGL 2.1 or less. The extension
      manager has been removed, and its functionality replaced.
      
      Change-Id: I60f8858a315a0e91c175aef6152ab57d26650cb4
      8bc98a02
  3. 13 Jun, 2014 15 commits
  4. 12 Jun, 2014 9 commits
    • Marcus D. Hanwell's avatar
      Removed vtkRenderingOpenGL as a dep now too! · ed6aa5a9
      Marcus D. Hanwell authored
      We don't need it anymore, and we want to be mutually exclusive to it.
      
      Change-Id: Iacbcf2bd4549788749ccc4bcef0f2c2eadc0e63e
      ed6aa5a9
    • Marcus D. Hanwell's avatar
      Removed the vtkFiltersCore dep · 6f1f9592
      Marcus D. Hanwell authored
      No longer needed, we stopped using the filter a while back.
      
      Change-Id: I8fca799d8e2b5b31c9122b6a167e4ba9ad7746d1
      6f1f9592
    • Berk Geveci's avatar
      PERF: Removed unnecessary function call. · 38851122
      Berk Geveci authored
      The result of NeedToExecuteData() was already cached in N2E and
      is not supposed to changed. Replaced the functional call with the
      variable.
      
      Change-Id: I295634db6239f626404854fb3aa66a8f74d8bb9a
      38851122
    • Berk Geveci's avatar
      Added new meta-data and request capability to the pipeline. · be279517
      Berk Geveci authored
      Added the ability for keys to copy themselves during pipeline passes.
      This allows arbitrary meta-data to flow back and forth in the pipeline
      with changing the executives. Although this is similar to KEYS_TO_COPY,
      it works significantly better. KEYS_TO_COPY has one major flow: it
      does not work if the algorithm that is supposed to add the key to
      KEYS_TO_COPY already executed and a filter downstream is causing re-
      execution.
      
      Also added the ability for keys to store meta-data in a data object's
      information. Allowing them to check it later in NeedToExecuteData.
      This allows filters to send a request upstream to potentially cause
      a new execution of the pipeline with changing the executives. This was
      not possible before.
      
      This was done by adding 3 new virtual methods to vtkInformationKey:
      NeedToExecute(), StoreMetaData() and CopyDefaultInformation(). Normally
      these do nothing. Subclasses can overwrite them to implement new
      behavior. These methods are called by the pipeline at certain times.
      CopyDefaultInformation() is called during CopyDefaultInformation(),
      StoreMetaData() after execution (REQUEST_DATA), NeedToExecute during
      NeedToExecuteData.
      
      Change-Id: Ice192eb0be9f0a47b512c1b0fa3cfbede74d81e1
      be279517
    • Marcus D. Hanwell's avatar
      Merge remote-tracking branch 'origin/master' into opengl2-rendering · f012a7b9
      Marcus D. Hanwell authored
      Conflicts:
      	Geovis/Core/Testing/Cxx/CMakeLists.txt
      	Rendering/OpenGL/Testing/Cxx/CMakeLists.txt
      
      Change-Id: Ib296a676bc42ab8eb917365a9d850f1d0b6a9fa5
      f012a7b9
    • Ben Boeckel's avatar
      Merge topic 'append-tests' into master · 8987514f
      Ben Boeckel authored
      788a28b1 testing: append the tests to the given variable
      8987514f
    • Utkarsh Ayachit's avatar
      Merge remote-tracking branch 'pvvtk/pv-master' into HEAD · a742807b
      Utkarsh Ayachit authored
      * pvvtk/pv-master:
      
      Change-Id: I76012fe6b08baf4f580d6e6d53e5feca034755bc
      a742807b
    • Utkarsh Ayachit's avatar
      Merge topic '14244_fix_stereo_image_captures' into pv-master · a42a11a0
      Utkarsh Ayachit authored
      edbb4ffe Merge topic '14244_fix_stereo_image_captures' into master
      fa145803 Merge topic 'python-algorithm-old-python' into master
      4b74588b vtkPythonAlgorithm: support older pythons
      a4e10e46 Merge topic 'manual-VTKData-option' into master
      56251ee5 Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
      7442036b Merge topic 'python-algorithm' into master
      169f0154 BUG #14244: Fix stereo image captures.
      6691160f FiltersPython: create a vtkPythonAlgorithm class
      e8ba24a5 vtkAlgorithm: fix a typo
      fec99e56 Add option to exclude VTKData target from default build
      a42a11a0
    • Marcus D. Hanwell's avatar
      Intel GLSL compiler is much fussier about type... · 6fc649b9
      Marcus D. Hanwell authored
      The .a component is a float, be sure to use a float in the comparison.
      
      Change-Id: I1f1e8a6138905e6b58fc3fed9c44e7dba3fb6acc
      6fc649b9
  5. 11 Jun, 2014 8 commits