Browse Source

mesa: refactor: new _mesa_init_pixelstore() function

(cherry picked from commit 5f91007f99)
tags/mesa_7_3_rc1
Brian Paul 17 years ago
parent
commit
533c1dbe75
4 changed files with 43 additions and 28 deletions
  1. 2
    0
      src/mesa/main/context.c
  2. 0
    28
      src/mesa/main/pixel.c
  3. 37
    0
      src/mesa/main/pixelstore.c
  4. 4
    0
      src/mesa/main/pixelstore.h

+ 2
- 0
src/mesa/main/context.c View File

@@ -106,6 +106,7 @@
#include "macros.h"
#include "matrix.h"
#include "pixel.h"
#include "pixelstore.h"
#include "points.h"
#include "polygon.h"
#include "queryobj.h"
@@ -995,6 +996,7 @@ init_attrib_groups(GLcontext *ctx)
_mesa_init_matrix( ctx );
_mesa_init_multisample( ctx );
_mesa_init_pixel( ctx );
_mesa_init_pixelstore( ctx );
_mesa_init_point( ctx );
_mesa_init_polygon( ctx );
_mesa_init_program( ctx );

+ 0
- 28
src/mesa/main/pixel.c View File

@@ -1306,34 +1306,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);

/* Pixel transfer */
ctx->Pack.Alignment = 4;
ctx->Pack.RowLength = 0;
ctx->Pack.ImageHeight = 0;
ctx->Pack.SkipPixels = 0;
ctx->Pack.SkipRows = 0;
ctx->Pack.SkipImages = 0;
ctx->Pack.SwapBytes = GL_FALSE;
ctx->Pack.LsbFirst = GL_FALSE;
ctx->Pack.ClientStorage = GL_FALSE;
ctx->Pack.Invert = GL_FALSE;
#if FEATURE_EXT_pixel_buffer_object
ctx->Pack.BufferObj = ctx->Array.NullBufferObj;
#endif
ctx->Unpack.Alignment = 4;
ctx->Unpack.RowLength = 0;
ctx->Unpack.ImageHeight = 0;
ctx->Unpack.SkipPixels = 0;
ctx->Unpack.SkipRows = 0;
ctx->Unpack.SkipImages = 0;
ctx->Unpack.SwapBytes = GL_FALSE;
ctx->Unpack.LsbFirst = GL_FALSE;
ctx->Unpack.ClientStorage = GL_FALSE;
ctx->Unpack.Invert = GL_FALSE;
#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

+ 37
- 0
src/mesa/main/pixelstore.c View File

@@ -224,3 +224,40 @@ _mesa_PixelStoref( GLenum pname, GLfloat param )
{
_mesa_PixelStorei( pname, (GLint) param );
}



/**
* Initialize the context's pixel store state.
*/
void
_mesa_init_pixelstore( GLcontext *ctx )
{
/* Pixel transfer */
ctx->Pack.Alignment = 4;
ctx->Pack.RowLength = 0;
ctx->Pack.ImageHeight = 0;
ctx->Pack.SkipPixels = 0;
ctx->Pack.SkipRows = 0;
ctx->Pack.SkipImages = 0;
ctx->Pack.SwapBytes = GL_FALSE;
ctx->Pack.LsbFirst = GL_FALSE;
ctx->Pack.ClientStorage = GL_FALSE;
ctx->Pack.Invert = GL_FALSE;
#if FEATURE_EXT_pixel_buffer_object
ctx->Pack.BufferObj = ctx->Array.NullBufferObj;
#endif
ctx->Unpack.Alignment = 4;
ctx->Unpack.RowLength = 0;
ctx->Unpack.ImageHeight = 0;
ctx->Unpack.SkipPixels = 0;
ctx->Unpack.SkipRows = 0;
ctx->Unpack.SkipImages = 0;
ctx->Unpack.SwapBytes = GL_FALSE;
ctx->Unpack.LsbFirst = GL_FALSE;
ctx->Unpack.ClientStorage = GL_FALSE;
ctx->Unpack.Invert = GL_FALSE;
#if FEATURE_EXT_pixel_buffer_object
ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
#endif
}

+ 4
- 0
src/mesa/main/pixelstore.h View File

@@ -43,4 +43,8 @@ extern void GLAPIENTRY
_mesa_PixelStoref( GLenum pname, GLfloat param );


extern void
_mesa_init_pixelstore( GLcontext *ctx );


#endif

Loading…
Cancel
Save