Merge branch 'master' into pv-master

* master: (439 commits)
  Trivial fixes for API change in OpenGL2 shaders
  Update baselines due to text rendering changes.
  FIX: Bypass testing if OpenGL extensions not supported
  XMLReader: Prevent streams from being closed when they don't exist.
  FIX: Make sure context is present
  vtkInformationDataObjectKey: move to CommonDataModel
  ENH: Volume Mapper benchmark test
  zlib: remove empty if statements
  cmake: fix up some version checks
  FindTBB: fix up typo'd logic
  cmake: remove @var@ expansions
  cmake: remove arguments to else and endfoo commands
  cmake: remove arguments from else and endfoo in zlib
  cmake: remove arguments from else and endfoo in xdmf3
  cmake: remove arguments from else and endfoo in xdmf2
  cmake: remove arguments from else and endfoo in VPIC
  cmake: remove arguments from else and endfoo in verdict
  cmake: remove arguments from else and endfoo in tiff
  cmake: remove arguments from else and endfoo in TclTk
  cmake: remove arguments from else and endfoo in sqlite
  ...

Change-Id: Ib25c67a3bb53c99987a185fc96f5974bec2b084f
Merge branch 'master' into update-vtk

* master: (439 commits)
  Trivial fixes for API change in OpenGL2 shaders
  Update baselines due to text rendering changes.
  FIX: Bypass testing if OpenGL extensions not supported
  XMLReader: Prevent streams from being closed when they don't exist.
  FIX: Make sure context is present
  vtkInformationDataObjectKey: move to CommonDataModel
  ENH: Volume Mapper benchmark test
  zlib: remove empty if statements
  cmake: fix up some version checks
  FindTBB: fix up typo'd logic
  cmake: remove @var@ expansions
  cmake: remove arguments to else and endfoo commands
  cmake: remove arguments from else and endfoo in zlib
  cmake: remove arguments from else and endfoo in xdmf3
  cmake: remove arguments from else and endfoo in xdmf2
  cmake: remove arguments from else and endfoo in VPIC
  cmake: remove arguments from else and endfoo in verdict
  cmake: remove arguments from else and endfoo in tiff
  cmake: remove arguments from else and endfoo in TclTk
  cmake: remove arguments from else and endfoo in sqlite
  ...

Change-Id: I4116b0a7e5eb876a7ba17e3103805b9d1da13021
Merge branch 'update-vtk' into pv-master

Change-Id: I7b5f404685026e65ccb70aa9d5c56fb0f0332505
Fix some compiler errors that show up on other compilers

Change-Id: Ic65052eb115762fdf11b915d51f0f80dc72385a7
Merge topic 'fix_compiler_errors' into master

4dd3ac00 Fix some compiler errors that show up on other compilers
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I5fd865b96b2a048650615680e791e6dc00d81fd4
Add in depth peeling pass and a couple other passes

Convert depth peeling render pass to the OpenGL2 backend.
Also add a new class that encapsulates the basic rendering
steps that VTK uses.

Modify the renderer to use the depth peeling pass instead of
having two copies of the code lying around. Removed the depth
peeling code from Mapper2D as it is no longer needed now that we
have CopyToFrameBuffer working. That is a lighter weight way to
get a quad up on the screen. Plus that keeps the depth peeling
code more localized as it should be. Clean up a lot of depth
peeling code that was in the renderer and now there are cleaner
ways of doing it (passing information keys).

Change-Id: I8d0a53bb25920bd30eade49ed12126b9b44be358
Merge topic 'more_render_pass' into master

925f5066 Add in depth peeling pass and a couple other passes
numpy_support: always support [u]int64

Using the variable key also overwrites other keys where long is 32 bits.
NumPy has 64 bit support all the time, so always map it to something.

Change-Id: I44fbbb64b3afe275343016ebe1583309b87fa11f
numpy_support: raise an error if a type cannot be found

Better than None popping up later in the code.

Change-Id: I60b8e9b711b309ac14297d462148c1008e19024d
Merge topic 'numpy-int64-support' into master

00877bc2 numpy_support: raise an error if a type cannot be found
28c46333 numpy_support: always support [u]int64
Fix use of undefined vector behavior.

The code was dereferencing an empty vector which is an undefined
operation in C++. VisualStudio 10 specifically checks for out of
range references and throws an exception causing the code to fail
rather harshly.

Change-Id: I81b30dc0886c75e6c7d47ab77b8d8d25f431e59b
Merge topic 'minor_vector_fix' into master

2fc1358c Fix use of undefined vector behavior.