mesa: refactor: move initialization of DefaultPacking state.

This commit is contained in:
Brian Paul
2008-06-20 11:31:05 -06:00
committed by Keith Whitwell
parent 9b8b58b79a
commit bb00f09f1b
2 changed files with 20 additions and 20 deletions

View File

@@ -910,26 +910,6 @@ _mesa_init_pixel( GLcontext *ctx )
ASSIGN_4V(ctx->Pixel.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0);
ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.0);
/*
* _mesa_unpack_image() returns image data in this format. When we
* execute image commands (glDrawPixels(), glTexImage(), etc) from
* within display lists we have to be sure to set the current
* unpacking parameters to these values!
*/
ctx->DefaultPacking.Alignment = 1;
ctx->DefaultPacking.RowLength = 0;
ctx->DefaultPacking.SkipPixels = 0;
ctx->DefaultPacking.SkipRows = 0;
ctx->DefaultPacking.ImageHeight = 0;
ctx->DefaultPacking.SkipImages = 0;
ctx->DefaultPacking.SwapBytes = GL_FALSE;
ctx->DefaultPacking.LsbFirst = GL_FALSE;
ctx->DefaultPacking.ClientStorage = GL_FALSE;
ctx->DefaultPacking.Invert = GL_FALSE;
#if FEATURE_EXT_pixel_buffer_object
ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
#endif
if (ctx->Visual.doubleBufferMode) {
ctx->Pixel.ReadBuffer = GL_BACK;
}

View File

@@ -260,4 +260,24 @@ _mesa_init_pixelstore( GLcontext *ctx )
#if FEATURE_EXT_pixel_buffer_object
ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
#endif
/*
* _mesa_unpack_image() returns image data in this format. When we
* execute image commands (glDrawPixels(), glTexImage(), etc) from
* within display lists we have to be sure to set the current
* unpacking parameters to these values!
*/
ctx->DefaultPacking.Alignment = 1;
ctx->DefaultPacking.RowLength = 0;
ctx->DefaultPacking.SkipPixels = 0;
ctx->DefaultPacking.SkipRows = 0;
ctx->DefaultPacking.ImageHeight = 0;
ctx->DefaultPacking.SkipImages = 0;
ctx->DefaultPacking.SwapBytes = GL_FALSE;
ctx->DefaultPacking.LsbFirst = GL_FALSE;
ctx->DefaultPacking.ClientStorage = GL_FALSE;
ctx->DefaultPacking.Invert = GL_FALSE;
#if FEATURE_EXT_pixel_buffer_object
ctx->DefaultPacking.BufferObj = ctx->Array.NullBufferObj;
#endif
}