summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/attrib.c2
-rw-r--r--src/mesa/main/debug.c3
-rw-r--r--src/mesa/main/mtypes.h2
-rw-r--r--src/mesa/main/pixelstore.c17
4 files changed, 2 insertions, 22 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 14159cf2f07..7734da98756 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1577,7 +1577,6 @@ _mesa_PopClientAttrib(void)
copy_pixelstore(ctx, &ctx->Pack, store);
_mesa_reference_buffer_object(ctx, &store->BufferObj, NULL);
}
- ctx->NewState |= _NEW_PACKUNPACK;
break;
case GL_CLIENT_UNPACK_BIT:
{
@@ -1586,7 +1585,6 @@ _mesa_PopClientAttrib(void)
copy_pixelstore(ctx, &ctx->Unpack, store);
_mesa_reference_buffer_object(ctx, &store->BufferObj, NULL);
}
- ctx->NewState |= _NEW_PACKUNPACK;
break;
case GL_CLIENT_VERTEX_ARRAY_BIT: {
struct gl_array_attrib * attr =
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 5dda766b934..bfd3d850db4 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -66,7 +66,7 @@ void
_mesa_print_state( const char *msg, GLuint state )
{
_mesa_debug(NULL,
- "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+ "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
msg,
state,
(state & _NEW_MODELVIEW) ? "ctx->ModelView, " : "",
@@ -88,7 +88,6 @@ _mesa_print_state( const char *msg, GLuint state )
(state & _NEW_TEXTURE) ? "ctx->Texture, " : "",
(state & _NEW_TRANSFORM) ? "ctx->Transform, " : "",
(state & _NEW_VIEWPORT) ? "ctx->Viewport, " : "",
- (state & _NEW_PACKUNPACK) ? "ctx->Pack/Unpack, " : "",
(state & _NEW_ARRAY) ? "ctx->Array, " : "",
(state & _NEW_RENDERMODE) ? "ctx->RenderMode, " : "",
(state & _NEW_BUFFERS) ? "ctx->Visual, ctx->DrawBuffer,, " : "");
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 42b26fd138a..1d12809a4c6 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3137,7 +3137,7 @@ struct gl_matrix_stack
#define _NEW_TEXTURE (1 << 16) /**< gl_context::Texture */
#define _NEW_TRANSFORM (1 << 17) /**< gl_context::Transform */
#define _NEW_VIEWPORT (1 << 18) /**< gl_context::Viewport */
-#define _NEW_PACKUNPACK (1 << 19) /**< gl_context::Pack, Unpack */
+/* gap, re-use for core Mesa state only; use ctx->DriverFlags otherwise */
#define _NEW_ARRAY (1 << 20) /**< gl_context::Array */
#define _NEW_RENDERMODE (1 << 21) /**< gl_context::RenderMode, etc */
#define _NEW_BUFFERS (1 << 22) /**< gl_context::Visual, DrawBuffer, */
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index 5635beff6ab..41424cc182f 100644
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -47,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:
@@ -55,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:
@@ -67,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:
@@ -79,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:
@@ -91,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:
@@ -103,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:
@@ -115,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:
@@ -125,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:
@@ -137,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;
@@ -148,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:
@@ -158,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:
@@ -170,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:
@@ -183,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:
@@ -195,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:
@@ -207,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:
@@ -219,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:
@@ -229,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:
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 10:46:56 +0000