projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
mesa: Allow setting GL_TEXTURE_MAX_LEVEL to 0 with GL_TEXTURE_RECTANGLE.
[mesa.git] / src / mesa / main / texformat.c
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 5b6eb7dc1a95c144efb6345eb659c55123becee0..004e7ebac823440938d865d540f5c81461cf77cf 100644 (file)
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -209,13 +209,13 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_DEPTH_COMPONENT24:
    case GL_DEPTH_COMPONENT32:
       RETURN_IF_SUPPORTED(MESA_FORMAT_Z_UNORM32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_X8_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       break;
    case GL_DEPTH_COMPONENT16:
       RETURN_IF_SUPPORTED(MESA_FORMAT_Z_UNORM16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_X8_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       break;
 
    case GL_COMPRESSED_ALPHA_ARB:
@@ -294,23 +294,23 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
       return MESA_FORMAT_RGBA_DXT5;
    case GL_COMPRESSED_RED_RGTC1:
-      return MESA_FORMAT_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_UNORM;
    case GL_COMPRESSED_SIGNED_RED_RGTC1:
-      return MESA_FORMAT_SIGNED_RED_RGTC1;
+      return MESA_FORMAT_R_RGTC1_SNORM;
    case GL_COMPRESSED_RG_RGTC2:
-      return MESA_FORMAT_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_UNORM;
    case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      return MESA_FORMAT_SIGNED_RG_RGTC2;
+      return MESA_FORMAT_RG_RGTC2_SNORM;
    case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_L_LATC1;
+      return MESA_FORMAT_L_LATC1_UNORM;
    case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
-      return MESA_FORMAT_SIGNED_L_LATC1;
+      return MESA_FORMAT_L_LATC1_SNORM;
    case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-      return MESA_FORMAT_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_UNORM;
    case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      return MESA_FORMAT_SIGNED_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_SNORM;
    case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      return MESA_FORMAT_LA_LATC2;
+      return MESA_FORMAT_LA_LATC2_UNORM;
    case GL_ETC1_RGB8_OES:
       return MESA_FORMAT_ETC1_RGB8;
    case GL_COMPRESSED_RGB8_ETC2:
@@ -426,7 +426,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
    case GL_DEPTH_STENCIL_EXT:
    case GL_DEPTH24_STENCIL8_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_S8_UINT_Z24_UNORM);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_X8_UINT);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_Z24_UNORM_S8_UINT);
       break;
 
    case GL_DEPTH_COMPONENT32F:
@@ -575,15 +575,15 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_ALPHA8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_ALPHA16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_ALPHA32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_A_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_LUMINANCE8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_UINT8);
@@ -599,15 +599,15 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_LUMINANCE8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_LUMINANCE16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_LUMINANCE32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_L_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_LUMINANCE_ALPHA8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_LA_UINT8);
@@ -623,15 +623,15 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_LUMINANCE_ALPHA8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_LUMINANCE_ALPHA16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_LUMINANCE_ALPHA32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_LA_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_INTENSITY8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_I_UINT8);
@@ -647,15 +647,15 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       break;
    case GL_INTENSITY8I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_INTENSITY16I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_INTENSITY32I_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_I_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
 
    case GL_RGB8UI_EXT:
@@ -674,19 +674,19 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_RGB8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT8);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT8);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_RGB16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT16);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT16);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_RGB32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_SINT32);
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBX_SINT32);
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
    case GL_RGBA8UI_EXT:
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT8);
@@ -698,13 +698,13 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_UINT32);
       break;
    case GL_RGBA8I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT8);
       break;
    case GL_RGBA16I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT16);
       break;
    case GL_RGBA32I_EXT:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_SINT32);
       break;
 
    case GL_R8:
@@ -714,7 +714,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 
    case GL_COMPRESSED_RED:
       if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1);
+         RETURN_IF_SUPPORTED(MESA_FORMAT_R_RGTC1_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_R_UNORM8);
       break;
 
@@ -729,7 +729,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
 
    case GL_COMPRESSED_RG:
       if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
-         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);
+         RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2_UNORM);
       RETURN_IF_SUPPORTED(MESA_FORMAT_R8G8_UNORM);
       break;
 
@@ -785,22 +785,22 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       RETURN_IF_SUPPORTED(MESA_FORMAT_RG_UINT32);
       break;
    case GL_R8I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT8);
       break;
    case GL_RG8I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT8);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT8);
       break;
    case GL_R16I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT16);
       break;
    case GL_RG16I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT16);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT16);
       break;
    case GL_R32I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_R_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_R_SINT32);
       break;
    case GL_RG32I:
-      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_INT32);
+      RETURN_IF_SUPPORTED(MESA_FORMAT_RG_SINT32);
       break;
 
    case GL_RGB10_A2UI: