mesa: Branch 'master'

[Alan Hourihane]

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

New commits:
diff-tree 985a2eff82111e81f70b6dea9d9b3184dd0061d3 (from 01b7f2ab2e7a9291bf54475e816e88804ee7cd53)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Thu Mar 22 14:26:49 2007 +0000

    Ensure we have a valid ReadBuffer for CopyTexSubImage, and
    
    if not bail accordingly.
    
    Previously we'd only do this test on compressed textures.

diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 543d6ef..706d346 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2061,12 +2061,6 @@ copytexsubimage_error_check2( GLcontext 
    }
 
    if (teximage->IsCompressed) {
-      if (!_mesa_source_buffer_exists(ctx, teximage->_BaseFormat)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glCopyTexSubImage%dD(missing readbuffer)", dimensions);
-         return GL_TRUE;
-      }
-
       if (target != GL_TEXTURE_2D) {
          _mesa_error(ctx, GL_INVALID_ENUM,
                      "glCopyTexSubImage%d(target)", dimensions);
@@ -2096,6 +2090,12 @@ copytexsubimage_error_check2( GLcontext 
       return GL_TRUE;
    }
 
+   if (!_mesa_source_buffer_exists(ctx, teximage->_BaseFormat)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+               "glCopyTexSubImage%dD(missing readbuffer)", dimensions);
+      return GL_TRUE;
+   }
+
    if (teximage->_BaseFormat == GL_DEPTH_COMPONENT) {
       if (!ctx->ReadBuffer->_DepthBuffer) {
          _mesa_error(ctx, GL_INVALID_OPERATION,