Mesa (master): mesa: remove redundant buffer checks in copytexture_error_check()

Brian Paul brianp at kemper.freedesktop.org
Thu Oct 13 06:41:06 PDT 2011


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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Oct 13 07:37:43 2011 -0600

mesa: remove redundant buffer checks in copytexture_error_check()

There was already a call to _mesa_source_buffer_exists() earlier in
the function.

Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/main/teximage.c |   16 ----------------
 1 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 8efe715..28c9705 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1975,22 +1975,6 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
          return GL_TRUE;
       }
    }
-   else if (_mesa_is_depth_format(internalFormat)) {
-      /* make sure we have depth/stencil buffers */
-      if (!ctx->ReadBuffer->_DepthBuffer) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexImage%dD(no depth)", dimensions);
-         return GL_TRUE;
-      }
-   }
-   else if (_mesa_is_depthstencil_format(internalFormat)) {
-      /* make sure we have depth/stencil buffers */
-      if (!ctx->ReadBuffer->_DepthBuffer || !ctx->ReadBuffer->_StencilBuffer) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexImage%dD(no depth/stencil buffer)", dimensions);
-         return GL_TRUE;
-      }
-   }
 
    /* if we get here, the parameters are OK */
    return GL_FALSE;



More information about the mesa-commit mailing list