diff options
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 8 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.h | 3 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_manager.c | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 2422640d849..9610ad30146 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -406,7 +406,7 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe, /* GL limits and extensions */ st_init_limits(pipe->screen, &ctx->Const, &ctx->Extensions); st_init_extensions(pipe->screen, &ctx->Const, - &ctx->Extensions, &st->options, GL_TRUE); + &ctx->Extensions, &st->options); if (st_have_perfmon(st)) { ctx->Extensions.AMD_performance_monitor = GL_TRUE; diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 4f2ad35d56e..c3c7d6f9f8b 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -572,8 +572,7 @@ get_max_samples_for_formats(struct pipe_screen *screen, void st_init_extensions(struct pipe_screen *screen, struct gl_constants *consts, struct gl_extensions *extensions, - struct st_config_options *options, - boolean has_lib_dxtc) + struct st_config_options *options) { unsigned i; 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. */ - 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, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0) { extensions->ARB_tessellation_shader = GL_TRUE; diff --git a/src/mesa/state_tracker/st_extensions.h b/src/mesa/state_tracker/st_extensions.h index faff11fd5d1..951185caa3b 100644 --- a/src/mesa/state_tracker/st_extensions.h +++ b/src/mesa/state_tracker/st_extensions.h @@ -40,8 +40,7 @@ extern void st_init_limits(struct pipe_screen *screen, extern void st_init_extensions(struct pipe_screen *screen, struct gl_constants *consts, struct gl_extensions *extensions, - struct st_config_options *options, - boolean has_lib_dxtc); + struct st_config_options *options); #endif /* ST_EXTENSIONS_H */ diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 6c7d836827b..50bc3c33c62 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -1166,7 +1166,7 @@ get_version(struct pipe_screen *screen, _mesa_init_extensions(&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); } |