Mesa (master): mesa: Fix render-to-texture regression.

Eric Anholt anholt at kemper.freedesktop.org
Sat Jun 18 23:00:37 UTC 2011


Module: Mesa
Branch: master
Commit: 6f998b58bc61f2507cd53204d7567299379c42ca
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f998b58bc61f2507cd53204d7567299379c42ca

Author: Eric Anholt <eric at anholt.net>
Date:   Sat Jun 18 15:59:00 2011 -0700

mesa: Fix render-to-texture regression.

Accidentally introduced in fc8c4a3a7b92a1134cd3a9312063abba9e14b0fe.
Fixes fbo-drawbuffers-maxtargets and friends.

---

 src/mesa/main/fbobject.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 07853e0..8cc3fd4 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1556,7 +1556,7 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
    GLuint i;
    ASSERT(ctx->Driver.RenderTexture);
 
-   if (is_winsys_fbo(fb));
+   if (is_winsys_fbo(fb))
       return; /* can't render to texture with winsys framebuffers */
 
    for (i = 0; i < BUFFER_COUNT; i++) {
@@ -1576,7 +1576,7 @@ 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 (is_winsys_fbo(fb));
+   if (is_winsys_fbo(fb))
       return; /* can't render to texture with winsys framebuffers */
 
    if (ctx->Driver.FinishRenderTexture) {




More information about the mesa-commit mailing list