Skip to content

Commit

Permalink
Merge topic 'es30_fix'
Browse files Browse the repository at this point in the history
a08d678 And whoa I committed a png undo that
06a4ef1 Tiny fix for OpenGL ES 3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Berk Geveci <berk.geveci@kitware.com>
Merge-request: !219
  • Loading branch information
Ken Martin authored and kwrobot committed May 19, 2015
2 parents 0e07183 + a08d678 commit 83d3d73
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
Binary file not shown.
1 change: 1 addition & 0 deletions Charts/Core/Testing/Data/Baseline/TestLinePlot3D_2.png.md5
@@ -0,0 +1 @@
af24804916f9f6054597dd44b07f975c
3 changes: 2 additions & 1 deletion Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
Expand Up @@ -480,8 +480,9 @@ int vtkOpenGLRenderWindow::GetColorBufferSizes(int *rgba)
GLint fboBind = 0;
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &fboBind);
GLint attachment = GL_BACK_LEFT;
#ifdef GL_DRAW_BUFFER
glGetIntegerv(GL_DRAW_BUFFER, &attachment);

#endif
// GL seems odd with its handling of left/right.
// if it says we are using GL_FRONT or GL_BACK
// then convert those to GL_FRONT_LEFT and
Expand Down

0 comments on commit 83d3d73

Please sign in to comment.