mesa/main: split float-texture support checking in two

[mesa.git] / src / mesa / main / glformats.c

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index a4b17a85b0974736e7af54dad4a540fd5cd8767f..7506c238232f61587b2f18d687c452192481dd4d 100644 (file)
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -1858,7 +1858,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
       return GL_NO_ERROR;
 
    case GL_UNSIGNED_INT_10F_11F_11F_REV:
-      if (!ctx->Extensions.EXT_packed_float) {
+      if (!_mesa_has_packed_float(ctx)) {
          return GL_INVALID_ENUM;
       }
       if (format != GL_RGB) {
@@ -1876,7 +1876,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
          return GL_NO_ERROR;
       case GL_RG:
       case GL_RED:
-        if (_mesa_is_gles3(ctx) || ctx->Extensions.ARB_texture_rg)
+         if (_mesa_has_rg_textures(ctx))
             return GL_NO_ERROR;
       default:
          return GL_INVALID_OPERATION;
@@ -1930,8 +1930,8 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
          }
 
       case GL_RG:
-        if (!ctx->Extensions.ARB_texture_rg)
-           return GL_INVALID_ENUM;
+         if (!_mesa_has_rg_textures(ctx))
+            return GL_INVALID_ENUM;
          switch (type) {
             case GL_BYTE:
             case GL_UNSIGNED_BYTE:
@@ -1966,10 +1966,10 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
                return (ctx->API == API_OPENGLES2)
                   ? GL_NO_ERROR : GL_INVALID_ENUM;
             case GL_UNSIGNED_INT_5_9_9_9_REV:
-               return ctx->Extensions.EXT_texture_shared_exponent
+               return _mesa_has_texture_shared_exponent(ctx)
                   ? GL_NO_ERROR : GL_INVALID_ENUM;
             case GL_UNSIGNED_INT_10F_11F_11F_REV:
-               return ctx->Extensions.EXT_packed_float
+               return _mesa_has_packed_float(ctx)
                   ? GL_NO_ERROR : GL_INVALID_ENUM;
             default:
                return GL_INVALID_ENUM;
@@ -2037,7 +2037,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
          }
 
       case GL_YCBCR_MESA:
-         if (!ctx->Extensions.MESA_ycbcr_texture)
+         if (!_mesa_has_MESA_ycbcr_texture(ctx))
             return GL_INVALID_ENUM;
          if (type == GL_UNSIGNED_SHORT_8_8_MESA ||
              type == GL_UNSIGNED_SHORT_8_8_REV_MESA)
@@ -2170,7 +2170,7 @@ _mesa_es_error_check_format_and_type(const struct gl_context *ctx,
    switch (format) {
    case GL_RED:
    case GL_RG:
-      if (ctx->API == API_OPENGLES || !ctx->Extensions.ARB_texture_rg)
+      if (!_mesa_has_rg_textures(ctx))
          return GL_INVALID_VALUE;
       /* fallthrough */
    case GL_ALPHA:
@@ -2194,7 +2194,7 @@ _mesa_es_error_check_format_and_type(const struct gl_context *ctx,
                     || type == GL_UNSIGNED_SHORT_5_5_5_1
                     || type == GL_FLOAT
                     || type == GL_HALF_FLOAT_OES
-                    || (ctx->Extensions.EXT_texture_type_2_10_10_10_REV &&
+                    || (_mesa_has_texture_type_2_10_10_10_REV(ctx) &&
                         type == GL_UNSIGNED_INT_2_10_10_10_REV));
       break;
 
@@ -2381,37 +2381,46 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
         is_astc_3d_format(internalFormat)))
         return GL_RGBA;
 
-   if (ctx->Extensions.MESA_ycbcr_texture) {
+   if (!_mesa_has_MESA_ycbcr_texture(ctx)) {
       if (internalFormat == GL_YCBCR_MESA)
          return GL_YCBCR_MESA;
    }
 
-   if (ctx->Extensions.ARB_texture_float) {
+   if (_mesa_has_half_float_textures(ctx)) {
       switch (internalFormat) {
       case GL_ALPHA16F_ARB:
-      case GL_ALPHA32F_ARB:
          return GL_ALPHA;
       case GL_RGBA16F_ARB:
-      case GL_RGBA32F_ARB:
          return GL_RGBA;
       case GL_RGB16F_ARB:
-      case GL_RGB32F_ARB:
          return GL_RGB;
       case GL_INTENSITY16F_ARB:
-      case GL_INTENSITY32F_ARB:
          return GL_INTENSITY;
       case GL_LUMINANCE16F_ARB:
-      case GL_LUMINANCE32F_ARB:
          return GL_LUMINANCE;
       case GL_LUMINANCE_ALPHA16F_ARB:
+         return GL_LUMINANCE_ALPHA;
+      }
+   }
+
+   if (_mesa_has_float_textures(ctx)) {
+      switch (internalFormat) {
+      case GL_ALPHA32F_ARB:
+         return GL_ALPHA;
+      case GL_RGBA32F_ARB:
+         return GL_RGBA;
+      case GL_RGB32F_ARB:
+         return GL_RGB;
+      case GL_INTENSITY32F_ARB:
+         return GL_INTENSITY;
+      case GL_LUMINANCE32F_ARB:
+         return GL_LUMINANCE;
       case GL_LUMINANCE_ALPHA32F_ARB:
          return GL_LUMINANCE_ALPHA;
-      default:
-         ; /* fallthrough */
       }
    }
 
-   if (ctx->Extensions.EXT_texture_snorm) {
+   if (_mesa_has_EXT_texture_snorm(ctx) || _mesa_is_gles3(ctx)) {
       switch (internalFormat) {
       case GL_RED_SNORM:
       case GL_R8_SNORM:
@@ -2450,7 +2459,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
       }
    }
 
-   if (ctx->Extensions.EXT_texture_sRGB) {
+   if (_mesa_has_EXT_texture_sRGB(ctx) || _mesa_is_gles3(ctx)) {
       switch (internalFormat) {
       case GL_SRGB_EXT:
       case GL_SRGB8_EXT:
@@ -2473,7 +2482,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
       }
    }
 
-   if (ctx->Extensions.EXT_texture_sRGB_R8) {
+   if (_mesa_has_EXT_texture_sRGB_R8(ctx)) {
       switch (internalFormat) {
       case GL_SR8_EXT:
          return GL_RED;
@@ -2543,12 +2552,15 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
       }
    }
 
-   if (ctx->Extensions.ARB_texture_rg) {
+   if (_mesa_has_rg_textures(ctx)) {
       switch (internalFormat) {
       case GL_R16F:
+         if (!_mesa_has_half_float_textures(ctx))
+            break;
+         return GL_RED;
       case GL_R32F:
-        if (!ctx->Extensions.ARB_texture_float)
-           break;
+         if (!_mesa_has_float_textures(ctx))
+            break;
          return GL_RED;
       case GL_R8I:
       case GL_R8UI:
@@ -2566,9 +2578,12 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
          return GL_RED;
 
       case GL_RG16F:
+         if (!_mesa_has_half_float_textures(ctx))
+            break;
+         return GL_RG;
       case GL_RG32F:
-        if (!ctx->Extensions.ARB_texture_float)
-           break;
+         if (!_mesa_has_float_textures(ctx))
+            break;
          return GL_RG;
       case GL_RG8I:
       case GL_RG8UI:
@@ -2589,7 +2604,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
       }
    }
 
-   if (ctx->Extensions.EXT_texture_shared_exponent) {
+   if (_mesa_has_texture_shared_exponent(ctx)) {
       switch (internalFormat) {
       case GL_RGB9_E5_EXT:
          return GL_RGB;
@@ -2598,7 +2613,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
       }
    }
 
-   if (ctx->Extensions.EXT_packed_float) {
+   if (_mesa_has_packed_float(ctx)) {
       switch (internalFormat) {
       case GL_R11F_G11F_B10F_EXT:
          return GL_RGB;
@@ -2874,7 +2889,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
          case GL_RGBA:
          case GL_RGB10_A2:
          case GL_RGB5_A1:
-            if (!ctx->Extensions.EXT_texture_type_2_10_10_10_REV)
+            if (!_mesa_has_texture_type_2_10_10_10_REV(ctx))
                return GL_INVALID_OPERATION;
             break;
          default:
@@ -2895,7 +2910,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
                return GL_INVALID_OPERATION;
             break;
          case GL_RGBA:
-            if (ctx->Extensions.OES_texture_float && internalFormat == format)
+            if (_mesa_has_OES_texture_float(ctx) && internalFormat == format)
                break;
          default:
             return GL_INVALID_OPERATION;
@@ -2903,7 +2918,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
          break;
 
       case GL_HALF_FLOAT_OES:
-         if (ctx->Extensions.OES_texture_half_float && internalFormat == format)
+         if (_mesa_has_OES_texture_half_float(ctx) && internalFormat == format)
             break;
       default:
          return GL_INVALID_OPERATION;
@@ -3030,7 +3045,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
                return GL_INVALID_OPERATION;
             break;
          case GL_RGB:
-            if (ctx->Extensions.OES_texture_float && internalFormat == format)
+            if (_mesa_has_OES_texture_float(ctx) && internalFormat == format)
                break;
          default:
             return GL_INVALID_OPERATION;
@@ -3038,7 +3053,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
          break;
 
       case GL_HALF_FLOAT_OES:
-         if (!ctx->Extensions.OES_texture_half_float || internalFormat != format)
+         if (!_mesa_has_OES_texture_half_float(ctx) || internalFormat != format)
             return GL_INVALID_OPERATION;
          break;
 
@@ -3052,7 +3067,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
              * GLES3 doesn't, and GL_OES_required_internalformat extends that
              * to allow the sized RGB internalformats as well.
              */
-            if (!ctx->Extensions.EXT_texture_type_2_10_10_10_REV)
+            if (!_mesa_has_texture_type_2_10_10_10_REV(ctx))
                return GL_INVALID_OPERATION;
             break;
          default:
@@ -3105,7 +3120,7 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
       break;
 
    case GL_RG:
-      if (!ctx->Extensions.ARB_texture_rg)
+      if (!_mesa_has_rg_textures(ctx))
          return GL_INVALID_OPERATION;
       switch (type) {
       case GL_UNSIGNED_BYTE:
@@ -3137,8 +3152,8 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
                   return GL_INVALID_OPERATION;
                break;
             case GL_RG:
-               if (ctx->Extensions.ARB_texture_rg &&
-                   ctx->Extensions.OES_texture_half_float)
+               if (_mesa_has_rg_textures(ctx) &&
+                   _mesa_has_OES_texture_half_float(ctx))
                   break;
             /* fallthrough */
             default:
@@ -3152,8 +3167,8 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
          case GL_RG32F:
             break;
          case GL_RG:
-            if (ctx->Extensions.ARB_texture_rg &&
-                ctx->Extensions.OES_texture_float)
+            if (_mesa_has_rg_textures(ctx) &&
+                _mesa_has_OES_texture_float(ctx))
                break;
             /* fallthrough */
          default:
@@ -3206,13 +3221,13 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
       break;
 
    case GL_RED:
-      if (!ctx->Extensions.ARB_texture_rg)
+      if (!_mesa_has_rg_textures(ctx))
          return GL_INVALID_OPERATION;
       switch (type) {
       case GL_UNSIGNED_BYTE:
          if (internalFormat == GL_R8 ||
              ((internalFormat == GL_SR8_EXT) &&
-              ctx->Extensions.EXT_texture_sRGB_R8))
+              _mesa_has_EXT_texture_sRGB_R8(ctx)))
             break;
          return GL_INVALID_OPERATION;
 
@@ -3241,8 +3256,8 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
             break;
          case GL_RG:
          case GL_RED:
-            if (ctx->Extensions.ARB_texture_rg &&
-                ctx->Extensions.OES_texture_half_float)
+            if (_mesa_has_rg_textures(ctx) &&
+                _mesa_has_OES_texture_half_float(ctx))
                break;
             /* fallthrough */
          default:
@@ -3256,8 +3271,8 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
          case GL_R32F:
             break;
          case GL_RED:
-            if (ctx->Extensions.ARB_texture_rg &&
-                ctx->Extensions.OES_texture_float)
+            if (_mesa_has_rg_textures(ctx) &&
+                _mesa_has_OES_texture_float(ctx))
                break;
             /* fallthrough */
          default:
@@ -3369,11 +3384,11 @@ _mesa_gles_error_check_format_and_type(const struct gl_context *ctx,
    case GL_LUMINANCE_ALPHA:
       switch (type) {
       case GL_FLOAT:
-         if (!ctx->Extensions.OES_texture_float || internalFormat != format)
+         if (!_mesa_has_OES_texture_float(ctx) || internalFormat != format)
             return GL_INVALID_OPERATION;
          break;
       case GL_HALF_FLOAT_OES:
-         if (!ctx->Extensions.OES_texture_half_float || internalFormat != format)
+         if (!_mesa_has_OES_texture_half_float(ctx) || internalFormat != format)
             return GL_INVALID_OPERATION;
          break;
       case GL_UNSIGNED_BYTE: