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

mesa: GL_EXT_shadow_funcs is not optional with GL_ARB_shadow

Browse Source 
Every driver left in Mesa that enables one also enables the other.
There's no reason to let it be optional.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Ian Romanick
2013-06-27 18:20:34 -07:00
committed by Kenneth Graunke
parent 41853b598c
commit 927f572c27
8 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/dri/i915/intel_extensions.c
View File

@@ -91,7 +91,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_texture_non_power_of_two = true;
ctx->Extensions.EXT_texture_sRGB = true;
ctx->Extensions.EXT_texture_sRGB_decode = true;
ctx->Extensions.EXT_shadow_funcs = true;
ctx->Extensions.EXT_stencil_two_side = true;
ctx->Extensions.ATI_separate_stencil = true;
ctx->Extensions.ATI_texture_env_combine3 = true;

1
src/mesa/drivers/dri/i965/intel_extensions.c
View File

@@ -105,7 +105,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.EXT_texture_sRGB = true;
ctx->Extensions.EXT_texture_sRGB_decode = true;
ctx->Extensions.EXT_texture_swizzle = true;
ctx->Extensions.EXT_shadow_funcs = true;
ctx->Extensions.EXT_stencil_two_side = true;
ctx->Extensions.EXT_vertex_array_bgra = true;
ctx->Extensions.APPLE_object_purgeable = true;

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

@@ -201,7 +201,7 @@ static const struct extension extension_table[] = {
{ "GL_EXT_secondary_color", o(dummy_true), GLL, 1999 },
{ "GL_EXT_separate_shader_objects", o(EXT_separate_shader_objects), GLL, 2008 },
{ "GL_EXT_separate_specular_color", o(dummy_true), GLL, 1997 },
{ "GL_EXT_shadow_funcs", o(EXT_shadow_funcs), GLL, 2002 },
{ "GL_EXT_shadow_funcs", o(ARB_shadow), GLL, 2002 },
{ "GL_EXT_stencil_two_side", o(EXT_stencil_two_side), GLL, 2001 },
{ "GL_EXT_stencil_wrap", o(dummy_true), GLL, 2002 },
{ "GL_EXT_subtexture", o(dummy_true), GLL, 1995 },
@@ -424,7 +424,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
ctx->Extensions.EXT_point_parameters = GL_TRUE;
ctx->Extensions.EXT_provoking_vertex = GL_TRUE;
ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
ctx->Extensions.EXT_texture_array = GL_TRUE;
ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;

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

@@ -3061,7 +3061,6 @@ struct gl_extensions
GLboolean EXT_pixel_buffer_object;
GLboolean EXT_point_parameters;
GLboolean EXT_provoking_vertex;
GLboolean EXT_shadow_funcs;
GLboolean EXT_separate_shader_objects;
GLboolean EXT_stencil_two_side;
GLboolean EXT_texture3D;

6
src/mesa/main/samplerobj.c
View File

@@ -529,21 +529,15 @@ set_sampler_compare_func(struct gl_context *ctx,
switch (param) {
case GL_LEQUAL:
case GL_GEQUAL:
flush(ctx);
samp->CompareFunc = param;
return GL_TRUE;
case GL_EQUAL:
case GL_NOTEQUAL:
case GL_LESS:
case GL_GREATER:
case GL_ALWAYS:
case GL_NEVER:
if (ctx->Extensions.EXT_shadow_funcs) {
flush(ctx);
samp->CompareFunc = param;
return GL_TRUE;
}
/* fall-through */
default:
return INVALID_PARAM;
}

6
src/mesa/main/texparam.c
View File

@@ -446,21 +446,15 @@ set_tex_parameteri(struct gl_context *ctx,
switch (params[0]) {
case GL_LEQUAL:
case GL_GEQUAL:
flush(ctx);
texObj->Sampler.CompareFunc = params[0];
return GL_TRUE;
case GL_EQUAL:
case GL_NOTEQUAL:
case GL_LESS:
case GL_GREATER:
case GL_ALWAYS:
case GL_NEVER:
if (ctx->Extensions.EXT_shadow_funcs) {
flush(ctx);
texObj->Sampler.CompareFunc = params[0];
return GL_TRUE;
}
/* fall-through */
default:
goto invalid_param;
}

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

@@ -207,8 +207,7 @@ compute_version(struct gl_context *ctx)
ctx->Extensions.EXT_blend_minmax &&
ctx->Extensions.EXT_point_parameters);
const GLboolean ver_1_5 = (ver_1_4 &&
ctx->Extensions.ARB_occlusion_query &&
ctx->Extensions.EXT_shadow_funcs);
ctx->Extensions.ARB_occlusion_query);
const GLboolean ver_2_0 = (ver_1_5 &&
ctx->Extensions.ARB_point_sprite &&
ctx->Extensions.ARB_vertex_shader &&

1
src/mesa/state_tracker/st_extensions.c
View File

@@ -397,7 +397,6 @@ void st_init_extensions(struct st_context *st)
{ o(EXT_blend_equation_separate), PIPE_CAP_BLEND_EQUATION_SEPARATE },
{ o(EXT_draw_buffers2), PIPE_CAP_INDEP_BLEND_ENABLE },
{ o(EXT_shadow_funcs), PIPE_CAP_TEXTURE_SHADOW_MAP },
{ o(EXT_stencil_two_side), PIPE_CAP_TWO_SIDED_STENCIL },
{ o(EXT_texture_array), PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS },
{ o(EXT_texture_filter_anisotropic), PIPE_CAP_ANISOTROPIC_FILTER },