aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/pack.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-14 14:47:07 +0200
committermarha <marha@users.sourceforge.net>2011-09-14 14:47:07 +0200
commite066f54c99aecce620158fe7f31589242df55677 (patch)
treef914574daeee09dafd33fa910d9c05cb2bdc7a3d /mesalib/src/mesa/main/pack.c
parent49659ef96348cc1bb20813abf7578acdb3cfe3d1 (diff)
downloadvcxsrv-e066f54c99aecce620158fe7f31589242df55677.tar.gz
vcxsrv-e066f54c99aecce620158fe7f31589242df55677.tar.bz2
vcxsrv-e066f54c99aecce620158fe7f31589242df55677.zip
mesa git update 14 sep 2011
Diffstat (limited to 'mesalib/src/mesa/main/pack.c')
-rw-r--r--mesalib/src/mesa/main/pack.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/pack.c b/mesalib/src/mesa/main/pack.c
index fd3f89d82..8388708a4 100644
--- a/mesalib/src/mesa/main/pack.c
+++ b/mesalib/src/mesa/main/pack.c
@@ -506,6 +506,13 @@ _mesa_pack_rgba_span_float(struct gl_context *ctx, GLuint n, GLfloat rgba[][4],
luminance = NULL;
}
+ /* EXT_texture_integer specifies no transfer ops on integer
+ * types in the resolved issues section. Just set them to 0
+ * for integer surfaces.
+ */
+ if (intDstFormat)
+ transferOps = 0;
+
if (transferOps) {
_mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);
}
@@ -3452,6 +3459,7 @@ _mesa_unpack_color_span_chan( struct gl_context *ctx,
const struct gl_pixelstore_attrib *srcPacking,
GLbitfield transferOps )
{
+ GLboolean intFormat = _mesa_is_integer_format(srcFormat);
ASSERT(dstFormat == GL_ALPHA ||
dstFormat == GL_LUMINANCE ||
dstFormat == GL_LUMINANCE_ALPHA ||
@@ -3500,6 +3508,13 @@ _mesa_unpack_color_span_chan( struct gl_context *ctx,
srcType == GL_UNSIGNED_INT_5_9_9_9_REV ||
srcType == GL_UNSIGNED_INT_10F_11F_11F_REV);
+ /* EXT_texture_integer specifies no transfer ops on integer
+ * types in the resolved issues section. Just set them to 0
+ * for integer surfaces.
+ */
+ if (intFormat)
+ transferOps = 0;
+
/* Try simple cases first */
if (transferOps == 0) {
if (srcType == CHAN_TYPE) {
@@ -3815,6 +3830,7 @@ _mesa_unpack_color_span_float( struct gl_context *ctx,
GLint dstComponents;
GLint rDst, gDst, bDst, aDst, lDst, iDst;
GLfloat (*rgba)[4] = (GLfloat (*)[4]) malloc(4 * n * sizeof(GLfloat));
+ GLboolean intFormat = _mesa_is_integer_format(srcFormat);
if (!rgba) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
@@ -3825,6 +3841,13 @@ _mesa_unpack_color_span_float( struct gl_context *ctx,
/* source & dest image formats should have been error checked by now */
assert(dstComponents > 0);
+ /* EXT_texture_integer specifies no transfer ops on integer
+ * types in the resolved issues section. Just set them to 0
+ * for integer surfaces.
+ */
+ if (intFormat)
+ transferOps = 0;
+
/*
* Extract image data and convert to RGBA floats
*/