diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-09-12 14:44:25 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-09-13 09:43:23 +0100 |
| commit | 1ab4e221fddcb0c825e6f51a46a3c908dd58e52a (patch) | |
| tree | 9beed22b4e380ba8d99814ef9e5ec237aec25cf4 /src/mesa/main/pack.c | |
| parent | f97acf40155a5d63a70ac6875df8128cb91d2369 (diff) | |
mesa/pack: don't apply transfer operations to integer format buffers. (v3)
The EXT_texture_integer issues says:
Should pixel transfer operations be defined for the integer pixel
path?
RESOLVED: No. Fragment shaders can achieve similar results
with more flexibility. There is no need to aggrandize this
legacy mechanism.
v2: fix comments, fix unpack paths, use same comment/code
v3: fix last comment
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/pack.c')
| -rw-r--r-- | src/mesa/main/pack.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index fd3f89d823c..8388708a4d8 100644 --- a/src/mesa/main/pack.c +++ b/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 */ |