GitLab

The prior commit contains the merging of the FBO and
FBO2 functionality. This commit removes a fair amount of
the old FBO functionality to keep the API clean and encourage
people to use FOs in a consistent manner.

having two VBO classes was confusing. This topic
moves the functionality of FBO2 into FBO while
keeping some of the original FBO functionality and
cleaning it up a bit.

All OpenGL2 code in VTK using FBOs is updated in
this topic to use the merged FBO class. Mainly this
impacts classes that were using the FBO class.

The old FBO methods and code are converted but
commented out in this commit.

e154eedb Merge branch 'upstream-KWSys' into update-kwsys
5e84b1dc

 KWSys 2016-11-08 (2b3e2b1c)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2149

28839f4a

 Fix issue with coincident geometry + MSAA. See #16899.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2124

* upstream-KWSys:
  KWSys 2016-11-08 (2b3e2b1c)

Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 2b3e2b1c28e676a1f4eb951104a1265a91c4df8c (master).

Upstream Shortlog
-----------------

Brad King (12):
      15e90a3c Sort includes to stabilize include order w.r.t. clang-format
      26509227 Copyright.txt: Add notice of copyright by contributors
      fc42d3f2 Add temporary script to filter license notices
      c41c1bc4 Simplify KWSys per-source license notices
      1d4c0b4a Remove temporary script that filtered license notices
      a4f5ef79 SystemInformation: Remove stray comment
      8649a886 kwsysPrivate: Protect KWSYS_HEADER macro from clang-format
      89b98af5 Configure clang-format for KWSys source tree
      547dacad Add a script to run clang-format on the entire source tree
      aa94be0c CONTRIBUTING: Add a section on coding style
      6604c4b6 Empty commit at end of history preceding clang-format style transition
      2b3e2b1c Tell Git to not export 'clang-format' infrastructure

Kitware Robot (1):
      6c973b46 Revise C++ coding style using clang-format

101f9eeb changed the polydata
fragment shaders to always write out gl_FragDepth explicitly to help
with the depth peeling abstractions. However, this causes issues when
multisampling, as the multisampled depths are not handled correctly when
gl_FragDepth is not the default value. [1] has some more detailed info.

After this patch, gl_FragDepth is only set when it is needed.

[1] http://www.gamedev.net/topic/544920-gl_fragdepth-and-anti-aliasing/#entry4514289

4c5da6c3

 Modify openfoam reader to support float or double point data.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2147

See mailing list report:

http://public.kitware.com/pipermail/paraview/2016-November/038405.html

a9fa6d3b

 add opengl resource management to polydatamapper2d
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2144

c70d738a Merge branch 'upstream-KWSys' into update-kwsys
62b9eb5b

 KWSys 2016-11-03 (37306a1c)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !2142

e6d0f507 Merge branch 'upstream-tiff'
864ceb4a

 tiff 2016-11-04 (ab642e7d)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !2145

b3adde6e

 Fixed stochastic jittering and added API to customize noise settings.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2130

* upstream-tiff:
  tiff 2016-11-04 (ab642e7d)

Code extracted from:

    https://gitlab.kitware.com/third-party/tiff.git

at commit ab642e7d4359bb3c24882a0ead3024f3a1c4cdc2 (for/vtk).

In some cases it could attempt to free opengl resources
when it was not the current context or after the context
was destroyed. Add the new resource management logic
via vtkOpenGLResourceFreeCallback the class to prevent
this.

* upstream-KWSys:
  KWSys 2016-11-03 (37306a1c)

Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 37306a1c73e991e239f32bfc8eda98ba2d1c149a (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      6d23dd7e SystemTools: add a PathExists method

Brad King (13):
      e43689db SystemTools: Factor out environment storage class
      2aa7dd82 SystemTools: Do not free buffer passed to putenv("A=") on Windows
      560bcdbb SystemTools: Factor out common `const char* GetEnv()` private implementation
      8e643b9b SystemTools: Fix crash in GetShortPath
      e736efa1 ConsoleBuf: Always compile test source for host Windows version
      0504dcaf SystemTools: Fix path comparison in test case
      c4049689 SystemTools: Teach GetActualCaseForPath to convert as much as possible
      66cd1138 ConsoleBuf: Avoid unnecessary initializations in test code
      4e6c9410 ConsoleBuf: Remove extra flush operations from test code
      80f820fc ConsoleBuf: Avoid use of __FUNCTION__ in tests
      6cfcbede SystemTools: Include strings.h on MinGW for strcasecmp
      dfe9b386 SystemTools: Re-implement Strucmp
      37306a1c FStream: Quiet unused argument warning

Dāvis Mosāns (15):
      19c31914 SystemTools: Abstract environment storage character type
      61301786 SystemTools: Tweak GetEnv/PutEnv implementation layout
      85920d53 SystemTools: Teach GetEnv/PutEnv to use correct encoding on Windows
      f396bf43 SystemTools: Add HasEnv function
      19732229 SystemTools: User better GetEnv and HasEnv signatures
      d2cdfc6d FStream: Use common base for basic_ifstream and basic_ofstream
      9d1dbd95 FStream: Add MinGW support
      669e3a06 ConsoleBuf: Use a custom std::streambuf for console output on Windows
      f53440fe ConsoleBuf: Improve test error messages
      fd9e86e8 ConsoleBuf: Use two separate events for test sync
      fb8530ed ConsoleBuf: Make test more reliable
      c49ddccb ConsoleBuf: Fix test registry restoration
      10e3f947 ConsoleBuf: Fix test to compare all bytes of wide character strings
      3f69ac40 ConsoleBuf: Output console and test buffers on test failure
      b630d2f5 ConsoleBuf: Check for actual console with GetConsoleMode

James Johnston (1):
      1c147abb Directory: Use Windows API wherever possible and port to Embarcadero

Patrick Welche (3):
      8a989b44 SystemInformation: Treat BSDs more uniformly
      2ce319a6 SystemInformation: Treat Solaris the same as Linux
      3f55579d SystemTools: Fix FileExists for some SCO OpenServer file permissions

08c27636

 fix a compiler error on es3
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2136

e5537ec4

 Avoid dereferencing NULL calldata pointer
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ken Martin <ken.martin@kitware.com>
Merge-request: !2138

GL_MULTISAMPLE is not defined for ES3

66361951

 Fix Windows issue with --fs-endpoints for vtkWeb server
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2143

The mapper uses vtkPerlinNoise by default with a texture size and frequency
equivalent to the window size.  It is possible to fully customize the noise
generator and texture size.  UseJittering changed to be off by default so some
of the baselines were updated.  Added tests for both default and customized noise
ray jittering.  Disabled TestGPURayCastMapperSampleDistance in legacy OpenGL.

c1b7705a

 BUG: TexturedSphereSource bad texture coordinates
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2129

46187e3c missing check
90f09635

 Segfault in create awindow
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2139

c4b5c976

 address compilation warnings from dashboards
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2140

dca54f17

 Fix crash in LoopSubdivisionFilter.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2134

there are some paths in the vtkXOpenGLRenderWindow (CreateAWindow for instance) that would need better NULL pointer check to avoid SEGFAULT and allow a clean abort.
this fix should also be merged to the release branch

This adds a check to vtkPythonCommand so that it doesn't attempt to
use the calldata pointer if the pointer is NULL.

3e03d8c6

 point pickig with msaa was using a msaa depth buffer
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2132

In 2012, an attempt to replace vtkMath::TwoPi() with 2.0*vtkMath::Pi()
was incorrect. After further investigation, the offending committer
was Bill Lorensen. Shame on you!

5df73b10

 In vtkVolumeOfRevolutionFilter, fix assignments to output cell locations.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2133

If this filter is given a dataset containing cells that are not
triangles, it will cause a segfault. This patch modifies the check
for cell types to fail if any non-triangle cell is found, rather
than just checking that some triangles exist.

0f750114

 Remove ES2 support for VTK 8.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci <berk.geveci@kitware.com>
Merge-request: !2126

a4bc54ee use a better and smaller data file fix bugs this exposed
7fc4b92b add the regression test input dataset
b94d6a59 Fix crash related to deselected blocks.
2e87ecc6 strengthen the test
ab244c3e

 A new reader for GE/LANL's TRUCHAS simulation files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: John Tourtellott <john.tourtellott@kitware.com>
Acked-by: Bob Obara <bob.obara@kitware.com>
Merge-request: !2108

msaa was not being turned off prior to setting the depth
buffer on point picking. Mixing a msaa depth buffer with
a non msaa color buffer was causing some issues.