fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: remove _NEW_PACKUNPACK

Browse source 
No driver checks the flag. Nobody uses it.

I also removed the FLUSH_VERTICES calls, because PixelStorei has no effect
on rendering.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Marek Olšák 2013-04-15 02:23:37 +02:00
parent 99bd76d834
commit d883d00878
6 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/i965/brw_state_upload.c
View file

@ -335,7 +335,6 @@ static struct dirty_bit_map mesa_bits[] = {
DEFINE_BIT(_NEW_TEXTURE),
DEFINE_BIT(_NEW_TRANSFORM),
DEFINE_BIT(_NEW_VIEWPORT),
DEFINE_BIT(_NEW_PACKUNPACK),
DEFINE_BIT(_NEW_ARRAY),
DEFINE_BIT(_NEW_RENDERMODE),
DEFINE_BIT(_NEW_BUFFERS),

2
src/mesa/main/attrib.c
View file

@ -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 =

3
src/mesa/main/debug.c
View file

@ -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,, " : "");

2
src/mesa/main/mtypes.h
View file

@ -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, */

17
src/mesa/main/pixelstore.c
View file

@ -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:

6
src/mesa/state_tracker/st_atom.c
View file

@ -160,11 +160,7 @@ void st_validate_state( struct st_context *st )
check_attrib_edgeflag(st);
/* The bitmap cache is immune to pixel unpack changes.
* Note that GLUT makes several calls to glPixelStore for each
* bitmap char it draws so this is an important check.
*/
if (state->mesa & ~_NEW_PACKUNPACK)
if (state->mesa)
st_flush_bitmap_cache(st);
check_program_state( st );