Commit d9b08c54 authored by Ken Martin's avatar Ken Martin Committed by Kitware Robot
Browse files

Merge topic 'remove_glflush'

e473e02b

 remove glFlush calls
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !1234
parents 97c647f2 e473e02b
......@@ -613,10 +613,6 @@ void vtkCocoaRenderWindow::Frame()
{
[(NSOpenGLContext*)this->GetContextId() flushBuffer];
}
else
{
glFlush();
}
}
//----------------------------------------------------------------------------
......
......@@ -149,10 +149,6 @@ void vtkEGLRenderWindow::Frame()
eglSwapBuffers(impl->Display, impl->Surface);
vtkDebugMacro(<< " eglSwapBuffers\n");
}
else
{
glFlush();
}
}
else
{
......@@ -161,10 +157,6 @@ void vtkEGLRenderWindow::Frame()
eglSwapBuffers( eglGetCurrentDisplay(), eglGetCurrentSurface( EGL_DRAW ) );
vtkDebugMacro(<< " eglSwapBuffers\n");
}
else
{
glFlush();
}
}
}
......
......@@ -279,10 +279,6 @@ void vtkIOSRenderWindow::Frame()
{
// [(NSOpenGLContext*)this->GetContextId() flushBuffer];
}
else
{
glFlush();
}
}
//----------------------------------------------------------------------------
......
......@@ -128,7 +128,6 @@ vtkOSOpenGLRenderWindow::~vtkOSOpenGLRenderWindow()
void vtkOSOpenGLRenderWindow::Frame()
{
this->MakeCurrent();
glFlush();
}
//
......
......@@ -230,7 +230,6 @@ void vtkOpenGLHardwareSelector::BeginRenderProp()
this->BeginRenderProp(renWin);
//cout << "In BeginRenderProp" << endl;
//glFinish();
if (this->CurrentPass == ACTOR_PASS)
{
int propid = this->PropID;
......
......@@ -970,9 +970,6 @@ void vtkOpenGLRenderWindow::DrawPixels(
this->DrawPixelsTextureObject->Create2DFromRaw(srcWidth, srcHeight,
numComponents, dataType, data);
this->DrawPixelsTextureObject->CopyToFrameBuffer(NULL, NULL);
// This seems to be necessary for the image to show up
glFlush();
}
// very generic call to draw pixel data to a region of the window
......@@ -999,9 +996,6 @@ void vtkOpenGLRenderWindow::DrawPixels(
dstXmin, dstYmin, dstXmax, dstYmax,
this->GetSize()[0], this->GetSize()[1],
NULL, NULL);
// This seems to be necessary for the image to show up
glFlush();
}
// less generic verison, old API
......@@ -1586,9 +1580,6 @@ int vtkOpenGLRenderWindow::SetRGBACharPixelData(int x1, int y1, int x2,
glDepthMask(GL_TRUE);
glEnable(GL_DEPTH_TEST);
// This seems to be necessary for the image to show up
glFlush();
glDrawBuffer(buffer);
if (glGetError() != GL_NO_ERROR)
......
......@@ -554,8 +554,6 @@ void vtkOpenGLRenderer::DonePick()
{
if (this->PickInfo->PerformedHardwarePick)
{
glFlush();
unsigned char *pixBuffer = this->GetRenderWindow()->GetPixelData(
this->PickX1, this->PickY1, this->PickX2, this->PickY2, 0);
// (this->GetRenderWindow()->GetSwapBuffers() == 1) ? 0 : 1);
......
......@@ -199,7 +199,6 @@ void vtkTransformFeedback::ReadBuffer()
}
glEndTransformFeedback();
glFlush();
size_t bufferSize = this->GetBufferSize();
this->ReleaseBufferData();
......
......@@ -369,10 +369,6 @@ void vtkWin32OpenGLRenderWindow::Frame(void)
vtkDebugMacro(<< " SwapBuffers\n");
}
}
else
{
glFlush();
}
}
void vtkWin32OpenGLRenderWindow::VTKRegisterClass()
......
......@@ -375,10 +375,6 @@ void vtkXOpenGLRenderWindow::Frame()
glXSwapBuffers(this->DisplayId, this->WindowId);
vtkDebugMacro(<< " glXSwapBuffers\n");
}
else
{
glFlush();
}
}
bool vtkXOpenGLRenderWindow::InitializeFromCurrentContext()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment