diff options
author | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-09-17 16:16:11 +0200 |
commit | c72f683c50e774b21967f0121245a286539fa555 (patch) | |
tree | fa5e86f04a33b8bcebf937d1966052ccf1fefbeb /mesalib/src/mesa/main/pixelstore.c | |
parent | 86fb7e4a298199b30bd16565569a9b3dfe7a1f11 (diff) | |
parent | e3c4aa34268f99562e66b43a7d9efcd16ca072e6 (diff) | |
download | vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.gz vcxsrv-c72f683c50e774b21967f0121245a286539fa555.tar.bz2 vcxsrv-c72f683c50e774b21967f0121245a286539fa555.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/syncobj.h
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/main/pixelstore.c')
-rw-r--r-- | mesalib/src/mesa/main/pixelstore.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/pixelstore.c b/mesalib/src/mesa/main/pixelstore.c index d1e96aa8f..e56d5049f 100644 --- a/mesalib/src/mesa/main/pixelstore.c +++ b/mesalib/src/mesa/main/pixelstore.c @@ -270,10 +270,8 @@ _mesa_init_pixelstore( struct gl_context *ctx ) ctx->Pack.SwapBytes = GL_FALSE; ctx->Pack.LsbFirst = GL_FALSE; ctx->Pack.Invert = GL_FALSE; -#if FEATURE_EXT_pixel_buffer_object _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, ctx->Shared->NullBufferObj); -#endif ctx->Unpack.Alignment = 4; ctx->Unpack.RowLength = 0; ctx->Unpack.ImageHeight = 0; @@ -283,10 +281,8 @@ _mesa_init_pixelstore( struct gl_context *ctx ) ctx->Unpack.SwapBytes = GL_FALSE; ctx->Unpack.LsbFirst = GL_FALSE; ctx->Unpack.Invert = GL_FALSE; -#if FEATURE_EXT_pixel_buffer_object _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, ctx->Shared->NullBufferObj); -#endif /* * _mesa_unpack_image() returns image data in this format. When we @@ -303,8 +299,6 @@ _mesa_init_pixelstore( struct gl_context *ctx ) ctx->DefaultPacking.SwapBytes = GL_FALSE; ctx->DefaultPacking.LsbFirst = GL_FALSE; ctx->DefaultPacking.Invert = GL_FALSE; -#if FEATURE_EXT_pixel_buffer_object _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, ctx->Shared->NullBufferObj); -#endif } |