OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Add ARB_texture_compression_rgtc as an alias for EXT_texture_compression_rgtc

Browse Source 
Change the name in the extension tracking structure to ARB (from EXT).
This commit is contained in:
Ian Romanick
2010-10-01 16:07:28 -07:00
parent e5fd15199d
commit e2a054b70c
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/main/extensions.c
View File

@@ -82,6 +82,7 @@ static const struct {
{ OFF, "GL_ARB_texture_border_clamp", F(ARB_texture_border_clamp) }, { OFF, "GL_ARB_texture_border_clamp", F(ARB_texture_border_clamp) },
{ OFF, "GL_ARB_texture_buffer_object", F(ARB_texture_buffer_object) }, { OFF, "GL_ARB_texture_buffer_object", F(ARB_texture_buffer_object) },
{ ON, "GL_ARB_texture_compression", F(ARB_texture_compression) }, { ON, "GL_ARB_texture_compression", F(ARB_texture_compression) },
{ OFF, "GL_ARB_texture_compression_rgtc", F(ARB_texture_compression_rgtc) },
{ OFF, "GL_ARB_texture_cube_map", F(ARB_texture_cube_map) }, { OFF, "GL_ARB_texture_cube_map", F(ARB_texture_cube_map) },
{ OFF, "GL_ARB_texture_env_add", F(EXT_texture_env_add) }, { OFF, "GL_ARB_texture_env_add", F(EXT_texture_env_add) },
{ OFF, "GL_ARB_texture_env_combine", F(ARB_texture_env_combine) }, { OFF, "GL_ARB_texture_env_combine", F(ARB_texture_env_combine) },
@@ -147,7 +148,7 @@ static const struct {
{ ON, "GL_EXT_texture3D", F(EXT_texture3D) }, { ON, "GL_EXT_texture3D", F(EXT_texture3D) },
{ OFF, "GL_EXT_texture_array", F(EXT_texture_array) }, { OFF, "GL_EXT_texture_array", F(EXT_texture_array) },
{ OFF, "GL_EXT_texture_compression_s3tc", F(EXT_texture_compression_s3tc) }, { OFF, "GL_EXT_texture_compression_s3tc", F(EXT_texture_compression_s3tc) },
{ OFF, "GL_EXT_texture_compression_rgtc", F(EXT_texture_compression_rgtc) }, { OFF, "GL_EXT_texture_compression_rgtc", F(ARB_texture_compression_rgtc) },
{ OFF, "GL_EXT_texture_cube_map", F(ARB_texture_cube_map) }, { OFF, "GL_EXT_texture_cube_map", F(ARB_texture_cube_map) },
{ ON, "GL_EXT_texture_edge_clamp", F(SGIS_texture_edge_clamp) }, { ON, "GL_EXT_texture_edge_clamp", F(SGIS_texture_edge_clamp) },
{ OFF, "GL_EXT_texture_env_add", F(EXT_texture_env_add) }, { OFF, "GL_EXT_texture_env_add", F(EXT_texture_env_add) },

2
src/mesa/main/mtypes.h
View File

@@ -2594,6 +2594,7 @@ struct gl_extensions
GLboolean ARB_texture_border_clamp; GLboolean ARB_texture_border_clamp;
GLboolean ARB_texture_buffer_object; GLboolean ARB_texture_buffer_object;
GLboolean ARB_texture_compression; GLboolean ARB_texture_compression;
GLboolean ARB_texture_compression_rgtc;
GLboolean ARB_texture_cube_map; GLboolean ARB_texture_cube_map;
GLboolean ARB_texture_env_combine; GLboolean ARB_texture_env_combine;
GLboolean ARB_texture_env_crossbar; GLboolean ARB_texture_env_crossbar;
@@ -2656,7 +2657,6 @@ struct gl_extensions
GLboolean EXT_texture3D; GLboolean EXT_texture3D;
GLboolean EXT_texture_array; GLboolean EXT_texture_array;
GLboolean EXT_texture_compression_s3tc; GLboolean EXT_texture_compression_s3tc;
GLboolean EXT_texture_compression_rgtc;
GLboolean EXT_texture_env_add; GLboolean EXT_texture_env_add;
GLboolean EXT_texture_env_combine; GLboolean EXT_texture_env_combine;
GLboolean EXT_texture_env_dot3; GLboolean EXT_texture_env_dot3;

10
src/mesa/main/teximage.c
View File

@@ -486,13 +486,13 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
} }
} }
if (ctx->Extensions.EXT_texture_compression_rgtc) { if (ctx->Extensions.ARB_texture_compression_rgtc) {
switch (internalFormat) { switch (internalFormat) {
case GL_COMPRESSED_RED_RGTC1_EXT: case GL_COMPRESSED_RED_RGTC1:
case GL_COMPRESSED_SIGNED_RED_RGTC1_EXT: case GL_COMPRESSED_SIGNED_RED_RGTC1:
return GL_RED; return GL_RED;
case GL_COMPRESSED_RED_GREEN_RGTC2_EXT: case GL_COMPRESSED_RG_RGTC2:
case GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT: case GL_COMPRESSED_SIGNED_RG_RGTC2:
return GL_RG; return GL_RG;
default: default:
; /* fallthrough */ ; /* fallthrough */

2
src/mesa/main/version.c
View File

@@ -92,6 +92,7 @@ compute_version(GLcontext *ctx)
ctx->Extensions.ARB_map_buffer_range && ctx->Extensions.ARB_map_buffer_range &&
ctx->Extensions.ARB_texture_float && ctx->Extensions.ARB_texture_float &&
ctx->Extensions.ARB_texture_rg && ctx->Extensions.ARB_texture_rg &&
ctx->Extensions.ARB_texture_compression_rgtc &&
ctx->Extensions.APPLE_vertex_array_object && ctx->Extensions.APPLE_vertex_array_object &&
ctx->Extensions.EXT_draw_buffers2 && ctx->Extensions.EXT_draw_buffers2 &&
ctx->Extensions.EXT_framebuffer_blit && ctx->Extensions.EXT_framebuffer_blit &&
@@ -101,7 +102,6 @@ compute_version(GLcontext *ctx)
ctx->Extensions.EXT_packed_depth_stencil && ctx->Extensions.EXT_packed_depth_stencil &&
ctx->Extensions.EXT_packed_float && ctx->Extensions.EXT_packed_float &&
ctx->Extensions.EXT_texture_array && ctx->Extensions.EXT_texture_array &&
ctx->Extensions.EXT_texture_compression_rgtc &&
ctx->Extensions.EXT_texture_integer && ctx->Extensions.EXT_texture_integer &&
ctx->Extensions.EXT_texture_shared_exponent && ctx->Extensions.EXT_texture_shared_exponent &&
ctx->Extensions.EXT_transform_feedback && ctx->Extensions.EXT_transform_feedback &&