We only use _mesa_make_temp_ubyte_image in texstore.c to convert
GL_COLOR_INDEX to RGBA, but this helper does more stuff than this.
All uses of this helper can be replaced with calls to
_mesa_format_convert except for this GL_COLOR_INDEX conversion.
This patch extracts the GL_COLOR_INDEX to RGBA logic to a separate
helper so we can use that instead from texstore.c.
In future patches we will replace all remaining calls to
_mesa_make_temp_ubyte_image in the repository (related to compressed
formats) with calls to _mesa_format_convert so we can remove
_mesa_make_temp_ubyte_image and related functions.
---
src/mesa/main/pack.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++
src/mesa/main/pack.h | 14 ++++++++++
2 files changed, 92 insertions(+)
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index fa4046c..aabe6a9 100644
--- a/src/mesa/main/pack.c
+++ b/src/mesa/main/pack.c
@@ -4398,3 +4398,81 @@ _mesa_pack_luminance_from_rgba_integer(GLuint n, GLuint
rgba[][4],
}
}
+GLfloat *
+_mesa_unpack_color_index_to_rgba_float(struct gl_context *ctx, GLuint dims,
+ const void *src, GLenum srcFormat,
GLenum srcType,
+ int srcWidth, int srcHeight, int
srcDepth,
+ const struct gl_pixelstore_attrib
*srcPacking,
+ GLbitfield transferOps)
+{
+ int count = srcWidth * srcHeight;
+ GLuint *indexes = malloc(count * sizeof(GLuint));
+ if (!indexes) {
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
+ return NULL;
+ }
+
+ GLfloat *rgba = malloc(4 * count * srcDepth * sizeof(GLfloat));
+ if (!rgba) {
+ free(indexes);
+ _mesa_error(ctx, GL_OUT_OF_MEMORY, "pixel unpacking");
+ return NULL;
+ }
+
+ /* Convert indexes to RGBA float */
+ GLfloat *dstPtr = rgba;
+ for (int img = 0; img < srcDepth; img++) {
+ const GLubyte *srcPtr =
+ (const GLubyte *) _mesa_image_address(dims, srcPacking, src,
+ srcWidth, srcHeight,
+ srcFormat, srcType,
+ img, 0, 0);
+
+ extract_uint_indexes(count, indexes, srcFormat, srcType, srcPtr,
srcPacking);
+
+ if (transferOps & IMAGE_SHIFT_OFFSET_BIT)
+ _mesa_shift_and_offset_ci(ctx, count, indexes);
+
+ _mesa_map_ci_to_rgba(ctx, count, indexes, (float (*)[4])dstPtr);
+
+ /* Don't do RGBA scale/bias or RGBA->RGBA mapping if starting
+ * with color indexes.
+ */
+ transferOps &= ~(IMAGE_SCALE_BIAS_BIT | IMAGE_MAP_COLOR_BIT);
+ _mesa_apply_rgba_transfer_ops(ctx, transferOps, count, (float
(*)[4])dstPtr);
+
+ dstPtr += srcHeight * srcWidth * 4;
+ }
+
+ free(indexes);
+
+ return rgba;
+}
+
+GLubyte *
+_mesa_unpack_color_index_to_rgba_ubyte(struct gl_context *ctx, GLuint dims,
+ const void *src, GLenum srcFormat,
GLenum srcType,
+ int srcWidth, int srcHeight, int
srcDepth,
+ const struct gl_pixelstore_attrib
*srcPacking,
+ GLbitfield transferOps)
+{
+ transferOps |= IMAGE_CLAMP_BIT;
+ GLfloat *rgba =
+ _mesa_unpack_color_index_to_rgba_float(ctx, dims,
+ src, srcFormat, srcType,
+ srcWidth, srcHeight, srcDepth,
+ srcPacking, transferOps);
+
+ int count = srcWidth * srcHeight * srcDepth;
+ GLubyte *dst = malloc(count * 4 * sizeof(GLubyte));
+ for (int i = 0; i < count; i++) {
+ CLAMPED_FLOAT_TO_UBYTE(dst[i * 4 + 0], rgba[i * 4 + 0]);
+ CLAMPED_FLOAT_TO_UBYTE(dst[i * 4 + 1], rgba[i * 4 + 1]);
+ CLAMPED_FLOAT_TO_UBYTE(dst[i * 4 + 2], rgba[i * 4 + 2]);
+ CLAMPED_FLOAT_TO_UBYTE(dst[i * 4 + 3], rgba[i * 4 + 3]);
+ }
+
+ free(rgba);
+
+ return dst;
+}
diff --git a/src/mesa/main/pack.h b/src/mesa/main/pack.h
index 2783f23..5a532e0 100644
--- a/src/mesa/main/pack.h
+++ b/src/mesa/main/pack.h
@@ -164,4 +164,18 @@ extern void
_mesa_pack_luminance_from_rgba_integer(GLuint n, GLuint rgba[][4],
GLvoid *dstAddr, GLenum dst_format);
+extern GLfloat *
+_mesa_unpack_color_index_to_rgba_float(struct gl_context *ctx, GLuint dims,
+ const void *src, GLenum srcFormat,
GLenum srcType,
+ int srcWidth, int srcHeight, int
srcDepth,
+ const struct gl_pixelstore_attrib
*srcPacking,
+ GLbitfield transferOps);
+
+extern GLubyte *
+_mesa_unpack_color_index_to_rgba_ubyte(struct gl_context *ctx, GLuint dims,
+ const void *src, GLenum srcFormat,
GLenum srcType,
+ int srcWidth, int srcHeight, int
srcDepth,
+ const struct gl_pixelstore_attrib
*srcPacking,
+ GLbitfield transferOps);
+
#endif
--
1.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
