case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
+ case GL_ATC_RGB_AMD:
+ case GL_ATC_RGBA_EXPLICIT_ALPHA_AMD:
+ case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:
/* generic integer formats */
case GL_RED_INTEGER_EXT:
case GL_GREEN_INTEGER_EXT:
switch (_mesa_get_format_layout(m_format)) {
case MESA_FORMAT_LAYOUT_S3TC:
- if (_mesa_get_format_color_encoding(m_format) == GL_LINEAR) {
+ if (!_mesa_is_format_srgb(m_format)) {
return _mesa_has_EXT_texture_compression_s3tc(ctx);
} else {
- return _mesa_has_EXT_texture_sRGB(ctx) &&
+ return (_mesa_has_EXT_texture_sRGB(ctx) ||
+ _mesa_has_EXT_texture_compression_s3tc_srgb(ctx)) &&
_mesa_has_EXT_texture_compression_s3tc(ctx);
}
case MESA_FORMAT_LAYOUT_FXT1:
return _mesa_has_3DFX_texture_compression_FXT1(ctx);
case MESA_FORMAT_LAYOUT_RGTC:
- return _mesa_has_ARB_texture_compression_rgtc(ctx);
+ return _mesa_has_ARB_texture_compression_rgtc(ctx) ||
+ _mesa_has_EXT_texture_compression_rgtc(ctx);
case MESA_FORMAT_LAYOUT_LATC:
return _mesa_has_EXT_texture_compression_latc(ctx);
case MESA_FORMAT_LAYOUT_ETC1:
case MESA_FORMAT_LAYOUT_ETC2:
return _mesa_is_gles3(ctx) || _mesa_has_ARB_ES3_compatibility(ctx);
case MESA_FORMAT_LAYOUT_BPTC:
- return _mesa_has_ARB_texture_compression_bptc(ctx);
+ return _mesa_has_ARB_texture_compression_bptc(ctx) ||
+ _mesa_has_EXT_texture_compression_bptc(ctx);
case MESA_FORMAT_LAYOUT_ASTC:
return _mesa_has_KHR_texture_compression_astc_ldr(ctx);
+ case MESA_FORMAT_LAYOUT_ATC:
+ return _mesa_has_AMD_compressed_ATC_texture(ctx);
default:
return GL_FALSE;
}
break; /* OK */
}
if (format == GL_RGB_INTEGER_EXT &&
- ctx->Extensions.ARB_texture_rgb10_a2ui) {
+ _mesa_has_texture_rgb10_a2ui(ctx)) {
break; /* OK */
}
return GL_INVALID_OPERATION;
break; /* OK */
}
if ((format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT) &&
- ctx->Extensions.ARB_texture_rgb10_a2ui) {
+ _mesa_has_texture_rgb10_a2ui(ctx)) {
break; /* OK */
}
return GL_INVALID_OPERATION;
break; /* OK */
}
if ((format == GL_RGBA_INTEGER_EXT || format == GL_BGRA_INTEGER_EXT) &&
- ctx->Extensions.ARB_texture_rgb10_a2ui) {
+ _mesa_has_texture_rgb10_a2ui(ctx)) {
break; /* OK */
}
if (type == GL_UNSIGNED_INT_2_10_10_10_REV && format == GL_RGB &&
return GL_NO_ERROR;
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
- if (!ctx->Extensions.ARB_depth_buffer_float) {
+ if (!_mesa_has_float_depth_buffer(ctx)) {
return GL_INVALID_ENUM;
}
if (format != GL_DEPTH_STENCIL) {
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) {
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;
+ /* fallthrough */
default:
return GL_INVALID_OPERATION;
}
}
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:
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;
}
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)
case GL_DEPTH_STENCIL:
if (type == GL_UNSIGNED_INT_24_8)
return GL_NO_ERROR;
- else if (ctx->Extensions.ARB_depth_buffer_float &&
+ else if (_mesa_has_float_depth_buffer(ctx) &&
type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
return GL_NO_ERROR;
else
case GL_UNSIGNED_BYTE_2_3_3_REV:
case GL_UNSIGNED_SHORT_5_6_5:
case GL_UNSIGNED_SHORT_5_6_5_REV:
- return ctx->Extensions.ARB_texture_rgb10_a2ui
+ return _mesa_has_texture_rgb10_a2ui(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM;
default:
return GL_INVALID_ENUM;
case GL_UNSIGNED_INT_8_8_8_8_REV:
case GL_UNSIGNED_INT_10_10_10_2:
case GL_UNSIGNED_INT_2_10_10_10_REV:
- return ctx->Extensions.ARB_texture_rgb10_a2ui
+ return _mesa_has_texture_rgb10_a2ui(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM;
default:
return GL_INVALID_ENUM;
case GL_UNSIGNED_SHORT:
case GL_INT:
case GL_UNSIGNED_INT:
- return ctx->Extensions.EXT_texture_integer
+ return _mesa_has_integer_textures(ctx)
? GL_NO_ERROR : GL_INVALID_ENUM;
default:
return GL_INVALID_ENUM;
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:
|| 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;
}
}
- if (_mesa_has_ARB_ES2_compatibility(ctx) || _mesa_is_gles(ctx)) {
+ if (_mesa_has_ARB_ES2_compatibility(ctx) ||
+ _mesa_has_OES_framebuffer_object(ctx) ||
+ ctx->API == API_OPENGLES2) {
switch (internalFormat) {
case GL_RGB565:
return GL_RGB;
}
}
- if (ctx->Extensions.ARB_depth_texture) {
+ if (_mesa_has_ARB_depth_texture(ctx) || _mesa_has_OES_depth_texture(ctx) ||
+ ctx->API == API_OPENGL_CORE) {
switch (internalFormat) {
case GL_DEPTH_COMPONENT:
case GL_DEPTH_COMPONENT16:
}
}
- if (ctx->Extensions.ARB_texture_stencil8) {
+ if (_mesa_has_ARB_texture_stencil8(ctx) ||
+ _mesa_has_OES_texture_stencil8(ctx)) {
switch (internalFormat) {
case GL_STENCIL_INDEX:
case GL_STENCIL_INDEX1:
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:
}
}
- 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:
}
}
- if (ctx->Extensions.EXT_texture_sRGB_R8) {
+ if (_mesa_has_EXT_texture_sRGB_R8(ctx)) {
switch (internalFormat) {
case GL_SR8_EXT:
return GL_RED;
}
}
- if (ctx->Extensions.ARB_texture_rgb10_a2ui) {
+ if (_mesa_has_texture_rgb10_a2ui(ctx)) {
switch (internalFormat) {
case GL_RGB10_A2UI:
return GL_RGBA;
}
}
- if (ctx->Extensions.EXT_texture_integer) {
+ if (_mesa_has_integer_textures(ctx)) {
switch (internalFormat) {
case GL_ALPHA8UI_EXT:
case GL_ALPHA16UI_EXT:
}
}
- 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:
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:
}
}
- if (ctx->Extensions.EXT_texture_shared_exponent) {
+ if (_mesa_has_texture_shared_exponent(ctx)) {
switch (internalFormat) {
case GL_RGB9_E5_EXT:
return GL_RGB;
}
}
- if (ctx->Extensions.EXT_packed_float) {
+ if (_mesa_has_packed_float(ctx)) {
switch (internalFormat) {
case GL_R11F_G11F_B10F_EXT:
return GL_RGB;
}
}
- if (ctx->Extensions.ARB_depth_buffer_float) {
+ if (_mesa_has_float_depth_buffer(ctx)) {
switch (internalFormat) {
case GL_DEPTH_COMPONENT32F:
return GL_DEPTH_COMPONENT;
if (ctx->Version <= 20)
return GL_INVALID_OPERATION;
break;
+ case GL_COMPRESSED_RGBA_BPTC_UNORM:
+ case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:
+ if (!_mesa_has_EXT_texture_compression_bptc(ctx))
+ return GL_INVALID_OPERATION;
+ break;
default:
return GL_INVALID_OPERATION;
}
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:
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;
+ /* fallthrough */
default:
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)
break;
+ /* fallthrough */
default:
return GL_INVALID_OPERATION;
}
if (ctx->Version <= 20)
return GL_INVALID_OPERATION;
break;
+ case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT:
+ case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
+ if (!_mesa_has_EXT_texture_compression_bptc(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;
+ /* fallthrough */
default:
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;
* 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:
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:
- if (internalFormat != GL_RG8)
+ if (internalFormat != GL_RG8 &&
+ (!_mesa_has_EXT_texture_compression_rgtc(ctx) ||
+ internalFormat != GL_COMPRESSED_RED_GREEN_RGTC2_EXT))
return GL_INVALID_OPERATION;
break;
case GL_BYTE:
- if (internalFormat != GL_RG8_SNORM)
+ if (internalFormat != GL_RG8_SNORM &&
+ (!_mesa_has_EXT_texture_compression_rgtc(ctx) ||
+ internalFormat != GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT))
return GL_INVALID_OPERATION;
break;
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:
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:
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)) ||
+ (internalFormat == GL_COMPRESSED_RED_RGTC1_EXT &&
+ _mesa_has_EXT_texture_compression_rgtc(ctx)))
break;
return GL_INVALID_OPERATION;
case GL_BYTE:
- if (internalFormat != GL_R8_SNORM)
+ if (internalFormat != GL_R8_SNORM &&
+ (!_mesa_has_EXT_texture_compression_rgtc(ctx) ||
+ internalFormat != GL_COMPRESSED_SIGNED_RED_RGTC1_EXT))
return GL_INVALID_OPERATION;
break;
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:
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:
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:
case GL_INTENSITY:
set_swizzle(swizzle, 0, 0, 0, 0);
return true;
+ case GL_DEPTH_COMPONENT:
+ set_swizzle(swizzle, 0, 6, 6, 6);
+ return true;
+ case GL_STENCIL_INDEX:
+ set_swizzle(swizzle, 6, 0, 6, 6);
+ return true;
+ default:
+ return false;
+ }
+}
+
+bool
+_mesa_swap_bytes_in_type_enum(GLenum *type)
+{
+ switch (*type) {
+ case GL_UNSIGNED_INT_8_8_8_8:
+ *type = GL_UNSIGNED_INT_8_8_8_8_REV;
+ return true;
+ case GL_UNSIGNED_INT_8_8_8_8_REV:
+ *type = GL_UNSIGNED_INT_8_8_8_8;
+ return true;
+ case GL_UNSIGNED_SHORT_8_8_MESA:
+ *type = GL_UNSIGNED_SHORT_8_8_REV_MESA;
+ return true;
+ case GL_UNSIGNED_SHORT_8_8_REV_MESA:
+ *type = GL_UNSIGNED_SHORT_8_8_MESA;
+ return true;
+ case GL_BYTE:
+ case GL_UNSIGNED_BYTE:
+ /* format/types that are arrays of 8-bit values are unaffected by
+ * swapBytes.
+ */
+ return true;
default:
+ /* swapping bytes on 4444, 1555, or >8 bit per channel types etc. will
+ * never match a Mesa format.
+ */
return false;
}
}
bool normalized = false, is_float = false, is_signed = false;
int num_channels = 0, type_size = 0;
+ if (format == GL_COLOR_INDEX)
+ return MESA_FORMAT_NONE;
+
/* Extract array format type information from the OpenGL data type */
switch (type) {
case GL_UNSIGNED_BYTE:
* create the array format
*/
if (is_array_format) {
- normalized = !_mesa_is_enum_format_integer(format);
+ enum mesa_array_format_base_format bf;
+ switch (format) {
+ case GL_DEPTH_COMPONENT:
+ bf = MESA_ARRAY_FORMAT_BASE_FORMAT_DEPTH;
+ break;
+ case GL_STENCIL_INDEX:
+ bf = MESA_ARRAY_FORMAT_BASE_FORMAT_STENCIL;
+ break;
+ default:
+ bf = MESA_ARRAY_FORMAT_BASE_FORMAT_RGBA_VARIANTS;
+ break;
+ }
+
+ normalized = !(_mesa_is_enum_format_integer(format) ||
+ format == GL_STENCIL_INDEX);
num_channels = _mesa_components_in_format(format);
- return MESA_ARRAY_FORMAT(type_size, is_signed, is_float,
+ return MESA_ARRAY_FORMAT(bf, type_size, is_signed, is_float,
normalized, num_channels,
swizzle[0], swizzle[1], swizzle[2], swizzle[3]);
}
break;
case GL_UNSIGNED_INT_24_8:
if (format == GL_DEPTH_STENCIL)
- return MESA_FORMAT_Z24_UNORM_S8_UINT;
+ return MESA_FORMAT_S8_UINT_Z24_UNORM;
+ else if (format == GL_DEPTH_COMPONENT)
+ return MESA_FORMAT_X8_UINT_Z24_UNORM;
break;
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
if (format == GL_DEPTH_STENCIL)
break;
}
+ fprintf(stderr, "Unsupported format/type: %s/%s\n",
+ _mesa_enum_to_string(format),
+ _mesa_enum_to_string(type));
+
/* If we got here it means that we could not find a Mesa format that
* matches the GL format/type provided. We may need to add a new Mesa
* format in that case.
projects / mesa.git / blobdiff