mesa: refactor: new _mesa_init_pixelstore() function
(cherry picked from commit 5f91007f99
)
This commit is contained in:

committed by
Keith Whitwell

parent
c9e5671691
commit
533c1dbe75
@@ -106,6 +106,7 @@
|
|||||||
#include "macros.h"
|
#include "macros.h"
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "pixel.h"
|
#include "pixel.h"
|
||||||
|
#include "pixelstore.h"
|
||||||
#include "points.h"
|
#include "points.h"
|
||||||
#include "polygon.h"
|
#include "polygon.h"
|
||||||
#include "queryobj.h"
|
#include "queryobj.h"
|
||||||
@@ -995,6 +996,7 @@ init_attrib_groups(GLcontext *ctx)
|
|||||||
_mesa_init_matrix( ctx );
|
_mesa_init_matrix( ctx );
|
||||||
_mesa_init_multisample( ctx );
|
_mesa_init_multisample( ctx );
|
||||||
_mesa_init_pixel( ctx );
|
_mesa_init_pixel( ctx );
|
||||||
|
_mesa_init_pixelstore( ctx );
|
||||||
_mesa_init_point( ctx );
|
_mesa_init_point( ctx );
|
||||||
_mesa_init_polygon( ctx );
|
_mesa_init_polygon( ctx );
|
||||||
_mesa_init_program( ctx );
|
_mesa_init_program( ctx );
|
||||||
|
@@ -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.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0);
|
||||||
ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.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
|
* _mesa_unpack_image() returns image data in this format. When we
|
||||||
* execute image commands (glDrawPixels(), glTexImage(), etc) from
|
* execute image commands (glDrawPixels(), glTexImage(), etc) from
|
||||||
|
@@ -224,3 +224,40 @@ _mesa_PixelStoref( GLenum pname, GLfloat param )
|
|||||||
{
|
{
|
||||||
_mesa_PixelStorei( pname, (GLint) 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
|
||||||
|
}
|
||||||
|
@@ -43,4 +43,8 @@ extern void GLAPIENTRY
|
|||||||
_mesa_PixelStoref( GLenum pname, GLfloat param );
|
_mesa_PixelStoref( GLenum pname, GLfloat param );
|
||||||
|
|
||||||
|
|
||||||
|
extern void
|
||||||
|
_mesa_init_pixelstore( GLcontext *ctx );
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user