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

mesa/st: Drop has_lib_dxtc argument from st_init_extensions()

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Matt Turner
2017-09-27 21:19:23 -07:00
parent c5d5080284
commit f6c56e07fc
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/state_tracker/st_context.c
View File

@@ -406,7 +406,7 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe,
/* GL limits and extensions */ /* GL limits and extensions */
st_init_limits(pipe->screen, &ctx->Const, &ctx->Extensions); st_init_limits(pipe->screen, &ctx->Const, &ctx->Extensions);
st_init_extensions(pipe->screen, &ctx->Const, st_init_extensions(pipe->screen, &ctx->Const,
&ctx->Extensions, &st->options, GL_TRUE); &ctx->Extensions, &st->options);
if (st_have_perfmon(st)) { if (st_have_perfmon(st)) {
ctx->Extensions.AMD_performance_monitor = GL_TRUE; ctx->Extensions.AMD_performance_monitor = GL_TRUE;

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

@@ -572,8 +572,7 @@ get_max_samples_for_formats(struct pipe_screen *screen,
void st_init_extensions(struct pipe_screen *screen, void st_init_extensions(struct pipe_screen *screen,
struct gl_constants *consts, struct gl_constants *consts,
struct gl_extensions *extensions, struct gl_extensions *extensions,
struct st_config_options *options, struct st_config_options *options)
boolean has_lib_dxtc)
{ {
unsigned i; unsigned i;
GLboolean *extension_table = (GLboolean *) extensions; GLboolean *extension_table = (GLboolean *) extensions;
@@ -966,11 +965,6 @@ void st_init_extensions(struct pipe_screen *screen,
/* Below are the cases which cannot be moved into tables easily. */ /* Below are the cases which cannot be moved into tables easily. */
if (!has_lib_dxtc && !options->force_s3tc_enable) {
extensions->EXT_texture_compression_s3tc = GL_FALSE;
extensions->ANGLE_texture_compression_dxt = GL_FALSE;
}
if (screen->get_shader_param(screen, PIPE_SHADER_TESS_CTRL, if (screen->get_shader_param(screen, PIPE_SHADER_TESS_CTRL,
PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) { PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) {
extensions->ARB_tessellation_shader = GL_TRUE; extensions->ARB_tessellation_shader = GL_TRUE;

3
src/mesa/state_tracker/st_extensions.h
View File

@@ -40,8 +40,7 @@ extern void st_init_limits(struct pipe_screen *screen,
extern void st_init_extensions(struct pipe_screen *screen, extern void st_init_extensions(struct pipe_screen *screen,
struct gl_constants *consts, struct gl_constants *consts,
struct gl_extensions *extensions, struct gl_extensions *extensions,
struct st_config_options *options, struct st_config_options *options);
boolean has_lib_dxtc);
#endif /* ST_EXTENSIONS_H */ #endif /* ST_EXTENSIONS_H */

2
src/mesa/state_tracker/st_manager.c
View File

@@ -1166,7 +1166,7 @@ get_version(struct pipe_screen *screen,
_mesa_init_extensions(&extensions); _mesa_init_extensions(&extensions);
st_init_limits(screen, &consts, &extensions); st_init_limits(screen, &consts, &extensions);
st_init_extensions(screen, &consts, &extensions, options, GL_TRUE); st_init_extensions(screen, &consts, &extensions, options);
return _mesa_get_version(&extensions, &consts, api); return _mesa_get_version(&extensions, &consts, api);
} }