Module: Mesa
Branch: master
Commit: 1ab4e221fddcb0c825e6f51a46a3c908dd58e52a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1ab4e221fddcb0c825e6f51a46a3c908dd58e52a
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Sep 12 14:44:25 2011 +0100
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 <airl...@redhat.com>
Reviewed-by: Brian Paul <bri...@vmware.com>
---
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 fd3f89d..8388708 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
*/
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
