mesa: Set query->EverBound in glQueryCounter().

[mesa.git] / src / mesa / main / pixelstore.c

diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index d1e96aa8f57b7089ea87e70cfd9ac1e6d02e6c8a..0f55bc304fb8e340ba93d4d6151fe75d8dc8a4a3 100644 (file)
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -17,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 /**
@@ -32,7 +32,6 @@
 #include "bufferobj.h"
 #include "context.h"
 #include "pixelstore.h"
-#include "mfeatures.h"
 #include "mtypes.h"
 
 
@@ -41,7 +40,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
 {
    /* NOTE: this call can't be compiled into the display list */
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    switch (pname) {
       case GL_PACK_SWAP_BYTES:
@@ -49,7 +47,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
             goto invalid_enum_error;
         if (param == (GLint)ctx->Pack.SwapBytes)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
          ctx->Pack.SwapBytes = param ? GL_TRUE : GL_FALSE;
         break;
       case GL_PACK_LSB_FIRST:
@@ -57,7 +54,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
             goto invalid_enum_error;
         if (param == (GLint)ctx->Pack.LsbFirst)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
          ctx->Pack.LsbFirst = param ? GL_TRUE : GL_FALSE;
         break;
       case GL_PACK_ROW_LENGTH:
@@ -69,7 +65,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Pack.RowLength == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Pack.RowLength = param;
         break;
       case GL_PACK_IMAGE_HEIGHT:
@@ -81,7 +76,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Pack.ImageHeight == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Pack.ImageHeight = param;
          break;
       case GL_PACK_SKIP_PIXELS:
@@ -93,7 +87,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Pack.SkipPixels == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Pack.SkipPixels = param;
         break;
       case GL_PACK_SKIP_ROWS:
@@ -105,7 +98,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Pack.SkipRows == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Pack.SkipRows = param;
         break;
       case GL_PACK_SKIP_IMAGES:
@@ -117,7 +109,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Pack.SkipImages == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Pack.SkipImages = param;
         break;
       case GL_PACK_ALIGNMENT:
@@ -127,7 +118,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Pack.Alignment == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Pack.Alignment = param;
         break;
       case GL_PACK_INVERT_MESA:
@@ -139,7 +129,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
          }
          if (ctx->Pack.Invert == param)
             return;
-         FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
          ctx->Pack.Invert = param;
          break;
 
@@ -150,7 +139,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
            return;
         if ((GLint)ctx->Unpack.SwapBytes == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Unpack.SwapBytes = param ? GL_TRUE : GL_FALSE;
          break;
       case GL_UNPACK_LSB_FIRST:
@@ -160,7 +148,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
            return;
         if ((GLint)ctx->Unpack.LsbFirst == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Unpack.LsbFirst = param ? GL_TRUE : GL_FALSE;
         break;
       case GL_UNPACK_ROW_LENGTH:
@@ -172,7 +159,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Unpack.RowLength == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Unpack.RowLength = param;
         break;
       case GL_UNPACK_IMAGE_HEIGHT:
@@ -185,7 +171,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         if (ctx->Unpack.ImageHeight == param)
            return;
 
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Unpack.ImageHeight = param;
          break;
       case GL_UNPACK_SKIP_PIXELS:
@@ -197,7 +182,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Unpack.SkipPixels == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Unpack.SkipPixels = param;
         break;
       case GL_UNPACK_SKIP_ROWS:
@@ -209,7 +193,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Unpack.SkipRows == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Unpack.SkipRows = param;
         break;
       case GL_UNPACK_SKIP_IMAGES:
@@ -221,7 +204,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Unpack.SkipImages == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Unpack.SkipImages = param;
         break;
       case GL_UNPACK_ALIGNMENT:
@@ -231,7 +213,6 @@ _mesa_PixelStorei( GLenum pname, GLint param )
         }
         if (ctx->Unpack.Alignment == param)
            return;
-        FLUSH_VERTICES(ctx, _NEW_PACKUNPACK);
         ctx->Unpack.Alignment = param;
         break;
       default:
@@ -270,10 +251,8 @@ _mesa_init_pixelstore( struct gl_context *ctx )
    ctx->Pack.SwapBytes = GL_FALSE;
    ctx->Pack.LsbFirst = GL_FALSE;
    ctx->Pack.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
    _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj,
                                  ctx->Shared->NullBufferObj);
-#endif
    ctx->Unpack.Alignment = 4;
    ctx->Unpack.RowLength = 0;
    ctx->Unpack.ImageHeight = 0;
@@ -283,10 +262,8 @@ _mesa_init_pixelstore( struct gl_context *ctx )
    ctx->Unpack.SwapBytes = GL_FALSE;
    ctx->Unpack.LsbFirst = GL_FALSE;
    ctx->Unpack.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
    _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj,
                                  ctx->Shared->NullBufferObj);
-#endif
 
    /*
     * _mesa_unpack_image() returns image data in this format.  When we
@@ -303,8 +280,6 @@ _mesa_init_pixelstore( struct gl_context *ctx )
    ctx->DefaultPacking.SwapBytes = GL_FALSE;
    ctx->DefaultPacking.LsbFirst = GL_FALSE;
    ctx->DefaultPacking.Invert = GL_FALSE;
-#if FEATURE_EXT_pixel_buffer_object
    _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj,
                                  ctx->Shared->NullBufferObj);
-#endif
 }