1. 10 Nov, 2016 1 commit
    • Ken Martin's avatar
      Remove the old FBO compatability Code · 57bd525c
      Ken Martin authored
      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.
      57bd525c
  2. 09 Nov, 2016 1 commit
    • Ken Martin's avatar
      combine fbo and fbo2 into one class and clean it up · 39010fa7
      Ken Martin authored
      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.
      39010fa7
  3. 08 Nov, 2016 4 commits
    • Brad King's avatar
      Merge topic 'update-kwsys' · 5ad3a750
      Brad King authored
      e154eedb Merge branch 'upstream-KWSys' into update-kwsys
      5e84b1dc KWSys 2016-11-08 (2b3e2b1c)
      Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
      Reviewed-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
      Merge-request: !2149
      5ad3a750
    • David Lonie's avatar
      Merge topic '16899-MSAA-depth-fix' · 246344ea
      David Lonie authored
      28839f4a Fix issue with coincident geometry + MSAA. See #16899.
      Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
      Merge-request: !2124
      246344ea
    • Brad King's avatar
      Merge branch 'upstream-KWSys' into update-kwsys · e154eedb
      Brad King authored
      * upstream-KWSys:
        KWSys 2016-11-08 (2b3e2b1c)
      e154eedb
    • Kitware Robot's avatar
      KWSys 2016-11-08 (2b3e2b1c) · 5e84b1dc
      Kitware Robot authored
      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
      5e84b1dc
  4. 07 Nov, 2016 1 commit
  5. 04 Nov, 2016 11 commits
  6. 03 Nov, 2016 14 commits
  7. 02 Nov, 2016 8 commits