diff options
author | Ian Romanick <[email protected]> | 2015-11-11 14:34:11 -0800 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2016-02-10 10:59:40 -0800 |
commit | ab2b6317037cbe6746a3653d37562169e30c13da (patch) | |
tree | 4bc94ab8e18f6586b5f6c698b0ae58066dce390f /src/mesa/drivers/common | |
parent | e273bbd60b7bf2ef19b575d2a16f47409b39ddf1 (diff) |
meta: Don't save or restore the renderbuffer binding
Nothing left in meta does anything with the RBO binding, so we don't
need to save or restore it. The FBO binding is still modified.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/drivers/common')
-rw-r--r-- | src/mesa/drivers/common/meta.c | 6 | ||||
-rw-r--r-- | src/mesa/drivers/common/meta.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 26867d3969d..b42a3cf16ae 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -848,8 +848,6 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) save->DrawBufferName = ctx->DrawBuffer->Name; save->ReadBufferName = ctx->ReadBuffer->Name; - save->RenderbufferName = (ctx->CurrentRenderbuffer ? - ctx->CurrentRenderbuffer->Name : 0); } } @@ -1241,10 +1239,6 @@ _mesa_meta_end(struct gl_context *ctx) if (ctx->ReadBuffer->Name != save->ReadBufferName) _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, save->ReadBufferName); - if (!ctx->CurrentRenderbuffer || - ctx->CurrentRenderbuffer->Name != save->RenderbufferName) - _mesa_BindRenderbuffer(GL_RENDERBUFFER, save->RenderbufferName); - if (state & MESA_META_DRAW_BUFFERS) { _mesa_drawbuffers(ctx, ctx->DrawBuffer, ctx->Const.MaxDrawBuffers, save->ColorDrawBuffers, NULL); diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 074f70da6cd..3ff0fdddb59 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -186,7 +186,7 @@ struct save_state GLboolean RasterDiscard; GLboolean TransformFeedbackNeedsResume; - GLuint DrawBufferName, ReadBufferName, RenderbufferName; + GLuint DrawBufferName, ReadBufferName; /** MESA_META_DRAW_BUFFERS */ GLenum ColorDrawBuffers[MAX_DRAW_BUFFERS]; |