summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-03-03 09:16:48 -0800
committerEric Anholt <eric@anholt.net>2014-03-24 11:15:04 -0700
commit7ccb26fdecd520f91ff1197b685b8f4f63130e58 (patch)
tree9db43c705b6e8365e6a014d2d8509c8adb226504
parentdd4b2261841421ec7f4389afffb27d6a1dba870e (diff)
mesa: Stop skipping the FinishRenderTexture calls for winsys FBOs.
Now that BindRenderbufferTexImage() is a thing that drivers can do, winsys FBOs *can* have NeedsFinishRenderTexture set. v2: Keep the short-circuit for non-BindRenderbufferTexImage() drivers (review by Ken). Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/main/fbobject.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index c4083073b2..107919f0b3 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2004,8 +2004,9 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
static void
check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
{
- if (_mesa_is_winsys_fbo(fb))
- return; /* can't render to texture with winsys framebuffers */
+ /* Skip if we know NeedsFinishRenderTexture won't be set. */
+ if (_mesa_is_winsys_fbo(fb) && !ctx->Driver.BindRenderbufferTexImage)
+ return;
if (ctx->Driver.FinishRenderTexture) {
GLuint i;