Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in
  • O OpenFlipper
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Merge requests 2
    • Merge requests 2
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • OpenFlipper-FreeOpenFlipper-Free
  • OpenFlipper
  • Merge requests
  • !6

Revert "Merge branch 'gl_clipdistance_passthrough' into 'master'"

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Jan Möbius requested to merge revert-b64f4c56 into master Apr 27, 2017
  • Overview 0
  • Commits 1
  • Pipelines 0
  • Changes 3

This reverts merge request !4 (merged)

@tenter:

[ 8%] Building CXX object OpenFlipper/libs_required/ACG/CMakeFiles/ACG.dir/GL/ScreenQuad.cc.o [ 8%] Building CXX object OpenFlipper/libs_required/ACG/CMakeFiles/ACG.dir/GL/ShaderCache.cc.o [ 9%] Building CXX object OpenFlipper/libs_required/ACG/CMakeFiles/ACG.dir/GL/ShaderGenerator.cc.o /Users/jenkins/builds/8dfb9a4a/0/OpenFlipper-Free/OpenFlipper-Free/OpenFlipper/libs_required/ACG/GL/ShaderGenerator.cc:1623:21: error: use of undeclared identifier 'GL_MAX_CLIP_DISTANCES' glGetIntegerv(GL_MAX_CLIP_DISTANCES, &maxClipDistances); ^ 1 error generated. make[2]: *** [OpenFlipper/libs_required/ACG/CMakeFiles/ACG.dir/GL/ShaderGenerator.cc.o] Error 1 make[1]: *** [OpenFlipper/libs_required/ACG/CMakeFiles/ACG.dir/all] Error 2 make: *** [all] Error 2 Scanning dependencies of target tr_OpenFlipper [ 0%] Built target tr_OpenFlipper [ 2%] Built target OpenMeshCore [ 3%] Built target OpenMeshTools [ 4%] Building CXX object OpenFlipper/libs_required/ACG/CMakeFiles/ACG.dir/GL/ShaderGenerator.cc.o /Users/jenkins/builds/8dfb9a4a/0/OpenFlipper-Free/OpenFlipper-Free/OpenFlipper/libs_required/ACG/GL/ShaderGenerator.cc:1623:21: error: use of undeclared identifier 'GL_MAX_CLIP_DISTANCES' glGetIntegerv(GL_MAX_CLIP_DISTANCES, &maxClipDistances); ^

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: revert-b64f4c56