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

mesa: rename the AMD_conservative_depth extension flag to ARB

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Marek Olšák
2011-11-19 16:27:50 +01:00
parent e99df05cce
commit bbcb648bc2
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/glcpp/glcpp-parse.y
View File

@@ -1135,7 +1135,7 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
if (extensions->ARB_draw_instanced) if (extensions->ARB_draw_instanced)
add_builtin_define(parser, "GL_ARB_draw_instanced", 1); add_builtin_define(parser, "GL_ARB_draw_instanced", 1);
if (extensions->AMD_conservative_depth) { if (extensions->ARB_conservative_depth) {
add_builtin_define(parser, "GL_AMD_conservative_depth", 1); add_builtin_define(parser, "GL_AMD_conservative_depth", 1);
add_builtin_define(parser, "GL_ARB_conservative_depth", 1); add_builtin_define(parser, "GL_ARB_conservative_depth", 1);
} }

4
src/glsl/glsl_parser_extras.cpp
View File

@@ -256,7 +256,7 @@ struct _mesa_glsl_extension {
static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
/* target availability API availability */ /* target availability API availability */
/* name VS GS FS GL ES supported flag */ /* name VS GS FS GL ES supported flag */
EXT(ARB_conservative_depth, true, false, true, true, false, AMD_conservative_depth), EXT(ARB_conservative_depth, true, false, true, true, false, ARB_conservative_depth),
EXT(ARB_draw_buffers, false, false, true, true, false, dummy_true), EXT(ARB_draw_buffers, false, false, true, true, false, dummy_true),
EXT(ARB_draw_instanced, true, false, false, true, false, ARB_draw_instanced), EXT(ARB_draw_instanced, true, false, false, true, false, ARB_draw_instanced),
EXT(ARB_explicit_attrib_location, true, false, true, true, false, ARB_explicit_attrib_location), EXT(ARB_explicit_attrib_location, true, false, true, true, false, ARB_explicit_attrib_location),
@@ -265,7 +265,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
EXT(EXT_texture_array, true, false, true, true, false, EXT_texture_array), EXT(EXT_texture_array, true, false, true, true, false, EXT_texture_array),
EXT(ARB_shader_texture_lod, true, false, true, true, false, ARB_shader_texture_lod), EXT(ARB_shader_texture_lod, true, false, true, true, false, ARB_shader_texture_lod),
EXT(ARB_shader_stencil_export, false, false, true, true, false, ARB_shader_stencil_export), EXT(ARB_shader_stencil_export, false, false, true, true, false, ARB_shader_stencil_export),
EXT(AMD_conservative_depth, true, false, true, true, false, AMD_conservative_depth), EXT(AMD_conservative_depth, true, false, true, true, false, ARB_conservative_depth),
EXT(AMD_shader_stencil_export, false, false, true, true, false, ARB_shader_stencil_export), EXT(AMD_shader_stencil_export, false, false, true, true, false, ARB_shader_stencil_export),
EXT(OES_texture_3D, true, false, true, false, true, EXT_texture3D), EXT(OES_texture_3D, true, false, true, false, true, EXT_texture3D),
EXT(OES_EGL_image_external, true, false, true, false, true, OES_EGL_image_external), EXT(OES_EGL_image_external, true, false, true, false, true, OES_EGL_image_external),

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

@@ -81,7 +81,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_blend_func_extended", o(ARB_blend_func_extended), GL, 2009 }, { "GL_ARB_blend_func_extended", o(ARB_blend_func_extended), GL, 2009 },
{ "GL_ARB_color_buffer_float", o(ARB_color_buffer_float), GL, 2004 }, { "GL_ARB_color_buffer_float", o(ARB_color_buffer_float), GL, 2004 },
{ "GL_ARB_copy_buffer", o(ARB_copy_buffer), GL, 2008 }, { "GL_ARB_copy_buffer", o(ARB_copy_buffer), GL, 2008 },
{ "GL_ARB_conservative_depth", o(AMD_conservative_depth), GL, 2011 }, { "GL_ARB_conservative_depth", o(ARB_conservative_depth), GL, 2011 },
{ "GL_ARB_depth_buffer_float", o(ARB_depth_buffer_float), GL, 2008 }, { "GL_ARB_depth_buffer_float", o(ARB_depth_buffer_float), GL, 2008 },
{ "GL_ARB_depth_clamp", o(ARB_depth_clamp), GL, 2003 }, { "GL_ARB_depth_clamp", o(ARB_depth_clamp), GL, 2003 },
{ "GL_ARB_depth_texture", o(ARB_depth_texture), GL, 2001 }, { "GL_ARB_depth_texture", o(ARB_depth_texture), GL, 2001 },
@@ -257,7 +257,7 @@ static const struct extension extension_table[] = {
/* Vendor extensions */ /* Vendor extensions */
{ "GL_3DFX_texture_compression_FXT1", o(TDFX_texture_compression_FXT1), GL, 1999 }, { "GL_3DFX_texture_compression_FXT1", o(TDFX_texture_compression_FXT1), GL, 1999 },
{ "GL_AMD_conservative_depth", o(AMD_conservative_depth), GL, 2009 }, { "GL_AMD_conservative_depth", o(ARB_conservative_depth), GL, 2009 },
{ "GL_AMD_draw_buffers_blend", o(ARB_draw_buffers_blend), GL, 2009 }, { "GL_AMD_draw_buffers_blend", o(ARB_draw_buffers_blend), GL, 2009 },
{ "GL_AMD_seamless_cubemap_per_texture", o(AMD_seamless_cubemap_per_texture), GL, 2009 }, { "GL_AMD_seamless_cubemap_per_texture", o(AMD_seamless_cubemap_per_texture), GL, 2009 },
{ "GL_AMD_shader_stencil_export", o(ARB_shader_stencil_export), GL, 2009 }, { "GL_AMD_shader_stencil_export", o(ARB_shader_stencil_export), GL, 2009 },

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

@@ -2844,6 +2844,7 @@ struct gl_extensions
GLboolean ARB_ES2_compatibility; GLboolean ARB_ES2_compatibility;
GLboolean ARB_blend_func_extended; GLboolean ARB_blend_func_extended;
GLboolean ARB_color_buffer_float; GLboolean ARB_color_buffer_float;
GLboolean ARB_conservative_depth;
GLboolean ARB_copy_buffer; GLboolean ARB_copy_buffer;
GLboolean ARB_depth_buffer_float; GLboolean ARB_depth_buffer_float;
GLboolean ARB_depth_clamp; GLboolean ARB_depth_clamp;
@@ -2942,7 +2943,6 @@ struct gl_extensions
GLboolean EXT_vertex_array_bgra; GLboolean EXT_vertex_array_bgra;
GLboolean OES_standard_derivatives; GLboolean OES_standard_derivatives;
/* vendor extensions */ /* vendor extensions */
GLboolean AMD_conservative_depth;
GLboolean AMD_seamless_cubemap_per_texture; GLboolean AMD_seamless_cubemap_per_texture;
GLboolean APPLE_packed_pixels; GLboolean APPLE_packed_pixels;
GLboolean APPLE_vertex_array_object; GLboolean APPLE_vertex_array_object;