[Mesa-dev] [PATCH 15/22] mesa: Add a new texture format GL_COMPRESSED_SIGNED_RG11_EAC

Anuj Phogat anuj.phogat at gmail.com
Fri Nov 9 23:30:02 PST 2012


v2 : Add entry in texfetch_funcs[] array
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
---
 src/mesa/main/format_unpack.c |    7 +++++++
 src/mesa/main/formats.c       |   15 +++++++++++++--
 src/mesa/main/formats.h       |    1 +
 src/mesa/main/glformats.c     |    2 ++
 src/mesa/main/texcompress.c   |    9 +++++++++
 src/mesa/main/texformat.c     |    3 +++
 src/mesa/main/teximage.c      |    1 +
 src/mesa/main/texstore.c      |    1 +
 src/mesa/swrast/s_texfetch.c  |    6 ++++++
 9 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c
index 2fd706b..34b4b0f 100644
--- a/src/mesa/main/format_unpack.c
+++ b/src/mesa/main/format_unpack.c
@@ -1379,6 +1379,12 @@ unpack_ETC2_SIGNED_R11_EAC(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
+unpack_ETC2_SIGNED_RG11_EAC(const void *src, GLfloat dst[][4], GLuint n)
+{
+   /* XXX to do */
+}
+
+static void
 unpack_SIGNED_A8(const void *src, GLfloat dst[][4], GLuint n)
 {
    const GLbyte *s = ((const GLbyte *) src);
@@ -1634,6 +1640,7 @@ get_unpack_rgba_function(gl_format format)
       table[MESA_FORMAT_ETC2_R11_EAC] = unpack_ETC2_R11_EAC;
       table[MESA_FORMAT_ETC2_RG11_EAC] = unpack_ETC2_RG11_EAC;
       table[MESA_FORMAT_ETC2_SIGNED_R11_EAC] = unpack_ETC2_SIGNED_R11_EAC;
+      table[MESA_FORMAT_ETC2_SIGNED_RG11_EAC] = unpack_ETC2_SIGNED_RG11_EAC;
       table[MESA_FORMAT_SIGNED_A8] = unpack_SIGNED_A8;
       table[MESA_FORMAT_SIGNED_L8] = unpack_SIGNED_L8;
       table[MESA_FORMAT_SIGNED_AL88] = unpack_SIGNED_AL88;
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 909ebe3..7ae92a5 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -1468,6 +1468,16 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       4, 4, 8                    /* 8 bytes per 4x4 block */
    },
 
+   {
+      MESA_FORMAT_ETC2_SIGNED_RG11_EAC,
+      "MESA_FORMAT_ETC2_SIGNED_RG11_EAC",
+      GL_RG,
+      GL_SIGNED_NORMALIZED,
+      11, 11, 0, 0,
+      0, 0, 0, 0, 0,
+      4, 4, 16                    /* 16 bytes per 4x4 block */
+   },
+
    /* Signed formats from EXT_texture_snorm that are not in GL3.1 */
    {
       MESA_FORMAT_SIGNED_A8,
@@ -1920,9 +1930,8 @@ _mesa_get_uncompressed_format(gl_format format)
    case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
       return MESA_FORMAT_R16;
    case MESA_FORMAT_ETC2_RG11_EAC:
-      return MESA_FORMAT_RG1616;
    case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
-      return MESA_FORMAT_SIGNED_GR1616;
+      return MESA_FORMAT_RG1616;
    default:
 #ifdef DEBUG
       assert(!_mesa_is_format_compressed(format));
@@ -2371,6 +2380,7 @@ _mesa_format_to_type_and_comps(gl_format format,
    case MESA_FORMAT_ETC2_R11_EAC:
    case MESA_FORMAT_ETC2_RG11_EAC:
    case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
+   case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
       /* XXX generate error instead? */
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 0;
@@ -3008,6 +3018,7 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
    case MESA_FORMAT_ETC2_R11_EAC:
    case MESA_FORMAT_ETC2_RG11_EAC:
    case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
+   case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
       return GL_FALSE;
 
    case MESA_FORMAT_SIGNED_A8:
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index 230c776..6f0d0a7 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -266,6 +266,7 @@ typedef enum
    MESA_FORMAT_ETC2_R11_EAC,
    MESA_FORMAT_ETC2_RG11_EAC,
    MESA_FORMAT_ETC2_SIGNED_R11_EAC,
+   MESA_FORMAT_ETC2_SIGNED_RG11_EAC,
 
    MESA_FORMAT_SIGNED_A8,         /*                               AAAA AAAA */
    MESA_FORMAT_SIGNED_L8,         /*                               LLLL LLLL */
diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 4f3ff36..654123a 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -577,6 +577,7 @@ _mesa_is_color_format(GLenum format)
       case GL_COMPRESSED_R11_EAC:
       case GL_COMPRESSED_RG11_EAC:
       case GL_COMPRESSED_SIGNED_R11_EAC:
+      case GL_COMPRESSED_SIGNED_RG11_EAC:
       /* generic integer formats */
       case GL_RED_INTEGER_EXT:
       case GL_GREEN_INTEGER_EXT:
@@ -843,6 +844,7 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
    case GL_COMPRESSED_R11_EAC:
    case GL_COMPRESSED_RG11_EAC:
    case GL_COMPRESSED_SIGNED_R11_EAC:
+   case GL_COMPRESSED_SIGNED_RG11_EAC:
       return _mesa_is_gles3(ctx);
    case GL_PALETTE4_RGB8_OES:
    case GL_PALETTE4_RGBA8_OES:
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 2e2897e..1501985 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -87,6 +87,7 @@ _mesa_gl_compressed_format_base_format(GLenum format)
    case GL_COMPRESSED_RG:
    case GL_COMPRESSED_RG11_EAC:
    case GL_COMPRESSED_RG_RGTC2:
+   case GL_COMPRESSED_SIGNED_RG11_EAC:
    case GL_COMPRESSED_SIGNED_RG_RGTC2:
       return GL_RG;
 
@@ -310,6 +311,7 @@ _mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats)
          formats[n++] = GL_COMPRESSED_R11_EAC;
          formats[n++] = GL_COMPRESSED_RG11_EAC;
          formats[n++] = GL_COMPRESSED_SIGNED_R11_EAC;
+         formats[n++] = GL_COMPRESSED_SIGNED_RG11_EAC;
       }
       else {
          n += 1;
@@ -388,6 +390,8 @@ _mesa_glenum_to_compressed_format(GLenum format)
       return MESA_FORMAT_ETC2_RG11_EAC;
    case GL_COMPRESSED_SIGNED_R11_EAC:
       return MESA_FORMAT_ETC2_SIGNED_R11_EAC;
+   case GL_COMPRESSED_SIGNED_RG11_EAC:
+      return MESA_FORMAT_ETC2_SIGNED_RG11_EAC;
 
    default:
       return MESA_FORMAT_NONE;
@@ -463,6 +467,8 @@ _mesa_compressed_format_to_glenum(struct gl_context *ctx, gl_format mesaFormat)
       return GL_COMPRESSED_RG11_EAC;
    case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
       return GL_COMPRESSED_SIGNED_R11_EAC;
+   case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
+      return GL_COMPRESSED_SIGNED_RG11_EAC;
 
    default:
       _mesa_problem(ctx, "Unexpected mesa texture format in"
@@ -610,6 +616,9 @@ _mesa_decompress_image(gl_format format, GLuint width, GLuint height,
    case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
       fetch = _mesa_fetch_texel_2d_f_etc2_signed_r11_eac;
       break;
+   case MESA_FORMAT_ETC2_SIGNED_RG11_EAC:
+      fetch = _mesa_fetch_texel_2d_f_etc2_signed_rg11_eac;
+      break;
 
    default:
       _mesa_problem(NULL, "Unexpected format in _mesa_decompress_image()");
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index fe00c41..3136110 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -995,6 +995,9 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
          case GL_COMPRESSED_SIGNED_R11_EAC:
             RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_SIGNED_R11_EAC);
             break;
+         case GL_COMPRESSED_SIGNED_RG11_EAC:
+            RETURN_IF_SUPPORTED(MESA_FORMAT_ETC2_SIGNED_RG11_EAC);
+            break;
          default:
             ; /* fallthrough */
       }
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 889cb83..b8175c8 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -541,6 +541,7 @@ _mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
       case GL_COMPRESSED_SIGNED_R11_EAC:
          return GL_RED;
       case GL_COMPRESSED_RG11_EAC:
+      case GL_COMPRESSED_SIGNED_RG11_EAC:
          return GL_RG;
       default:
          ; /* fallthrough */
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index d8d9577..c9aa998 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -4131,6 +4131,7 @@ _mesa_get_texstore_func(gl_format format)
       table[MESA_FORMAT_ETC2_R11_EAC] = _mesa_texstore_etc2_r11_eac;
       table[MESA_FORMAT_ETC2_RG11_EAC] = _mesa_texstore_etc2_rg11_eac;
       table[MESA_FORMAT_ETC2_SIGNED_R11_EAC] = _mesa_texstore_etc2_signed_r11_eac;
+      table[MESA_FORMAT_ETC2_SIGNED_RG11_EAC] = _mesa_texstore_etc2_signed_rg11_eac;
       table[MESA_FORMAT_SIGNED_A8] = _mesa_texstore_snorm8;
       table[MESA_FORMAT_SIGNED_L8] = _mesa_texstore_snorm8;
       table[MESA_FORMAT_SIGNED_AL88] = _mesa_texstore_snorm88;
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index a93fac0..4a4100b 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -1071,6 +1071,12 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       NULL
    },
    {
+      MESA_FORMAT_ETC2_SIGNED_RG11_EAC,
+      NULL,
+      _mesa_fetch_texel_2d_f_etc2_signed_rg11_eac,
+      NULL
+   },
+   {
       MESA_FORMAT_SIGNED_A8,
       fetch_texel_1d_signed_a8,
       fetch_texel_2d_signed_a8,
-- 
1.7.7.6



More information about the mesa-dev mailing list