Revert "Flush driver, not just tnl module."
This reverts commit df058298e1
. It didn't
explain why it was required, doesnt appear to be required, and is a
significant performance penalty for cairo-gl firefox.
Conflicts:
src/mesa/main/fbobject.c
This commit is contained in:
@@ -718,12 +718,6 @@ _mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
|
||||
}
|
||||
|
||||
FLUSH_CURRENT(ctx, _NEW_BUFFERS);
|
||||
/* The above doesn't fully flush the drivers in the way that a
|
||||
* glFlush does, but that is required here:
|
||||
*/
|
||||
if (ctx->Driver.Flush)
|
||||
ctx->Driver.Flush(ctx);
|
||||
|
||||
|
||||
if (renderbuffer) {
|
||||
newRb = _mesa_lookup_renderbuffer(ctx, renderbuffer);
|
||||
@@ -1294,11 +1288,6 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
|
||||
|
||||
ASSERT_OUTSIDE_BEGIN_END(ctx);
|
||||
FLUSH_CURRENT(ctx, _NEW_BUFFERS);
|
||||
/* The above doesn't fully flush the drivers in the way that a
|
||||
* glFlush does, but that is required here:
|
||||
*/
|
||||
if (ctx->Driver.Flush)
|
||||
ctx->Driver.Flush(ctx);
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
if (framebuffers[i] > 0) {
|
||||
@@ -1532,11 +1521,6 @@ framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target,
|
||||
}
|
||||
|
||||
FLUSH_CURRENT(ctx, _NEW_BUFFERS);
|
||||
/* The above doesn't fully flush the drivers in the way that a
|
||||
* glFlush does, but that is required here:
|
||||
*/
|
||||
if (ctx->Driver.Flush)
|
||||
ctx->Driver.Flush(ctx);
|
||||
|
||||
_glthread_LOCK_MUTEX(fb->Mutex);
|
||||
if (texObj) {
|
||||
@@ -1713,11 +1697,6 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
|
||||
|
||||
|
||||
FLUSH_CURRENT(ctx, _NEW_BUFFERS);
|
||||
/* The above doesn't fully flush the drivers in the way that a
|
||||
* glFlush does, but that is required here:
|
||||
*/
|
||||
if (ctx->Driver.Flush)
|
||||
ctx->Driver.Flush(ctx);
|
||||
|
||||
assert(ctx->Driver.FramebufferRenderbuffer);
|
||||
ctx->Driver.FramebufferRenderbuffer(ctx, fb, attachment, rb);
|
||||
@@ -1794,11 +1773,6 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
|
||||
}
|
||||
|
||||
FLUSH_CURRENT(ctx, _NEW_BUFFERS);
|
||||
/* The above doesn't fully flush the drivers in the way that a
|
||||
* glFlush does, but that is required here:
|
||||
*/
|
||||
if (ctx->Driver.Flush)
|
||||
ctx->Driver.Flush(ctx);
|
||||
|
||||
switch (pname) {
|
||||
case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:
|
||||
|
Reference in New Issue
Block a user