diff options
author | Eric Anholt <eric@anholt.net> | 2013-04-17 13:55:08 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2013-04-29 11:41:33 -0700 |
commit | 97217a40f97cdeae0304798b607f704deb0c3558 (patch) | |
tree | 7a4f788c8a7c7af5e661ed8a66420f286c9b4fb5 | |
parent | eb062ab07f0bea3c7ce83274ed64ce9b5197c667 (diff) |
i915: Always enable GL 2.0 support.
There's no point in shipping a non-GL2 driver today.
-rwxr-xr-x | src/mesa/drivers/dri/intel/intel_extensions.c | 8 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_screen.c | 27 |
2 files changed, 5 insertions, 30 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 1aea7e9b648..46722e1cd71 100755 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -171,18 +171,14 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.ARB_texture_non_power_of_two = 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; ctx->Extensions.NV_texture_env_combine4 = true; - - if (driQueryOptionb(&intel->optionCache, "fragment_shader")) - ctx->Extensions.ARB_fragment_shader = true; - - if (driQueryOptionb(&intel->optionCache, "stub_occlusion_query")) - ctx->Extensions.ARB_occlusion_query = true; + ctx->Extensions.ARB_fragment_shader = true; + ctx->Extensions.ARB_occlusion_query = true; } if (intel->ctx.Mesa_DXTn || driQueryOptionb(&intel->optionCache, "force_s3tc_enable")) ctx->Extensions.EXT_texture_compression_s3tc = true; diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c index 374517980e7..ad1b351b711 100644 --- a/src/mesa/drivers/dri/intel/intel_screen.c +++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -59,16 +59,12 @@ PUBLIC const char __driConfigOptions[] = DRI_CONF_OPT_END DRI_CONF_OPT_BEGIN_B(early_z, "false") DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).") DRI_CONF_OPT_END - DRI_CONF_OPT_BEGIN_B(fragment_shader, "true") - DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.") - DRI_CONF_OPT_END - DRI_CONF_SECTION_END DRI_CONF_SECTION_QUALITY DRI_CONF_FORCE_S3TC_ENABLE("false") DRI_CONF_ALLOW_LARGE_TEXTURES(2) DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG @@ -77,23 +73,19 @@ PUBLIC const char __driConfigOptions[] = DRI_CONF_ALWAYS_FLUSH_CACHE("false") DRI_CONF_DISABLE_THROTTLING("false") DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false") - DRI_CONF_OPT_BEGIN_B(stub_occlusion_query, "false") - DRI_CONF_DESC(en, "Enable stub ARB_occlusion_query support on 915/945.") - DRI_CONF_OPT_END - DRI_CONF_OPT_BEGIN_B(shader_precompile, "true") DRI_CONF_DESC(en, "Perform code generation at shader link time.") DRI_CONF_OPT_END DRI_CONF_SECTION_END DRI_CONF_END; -const GLuint __driNConfigOptions = 16; +const GLuint __driNConfigOptions = 14; #include "intel_batchbuffer.h" #include "intel_buffers.h" #include "intel_bufmgr.h" #include "intel_chipset.h" #include "intel_fbo.h" @@ -1226,29 +1218,16 @@ set_max_gl_versions(struct intel_screen *screen) screen->max_gl_core_version = 0; screen->max_gl_compat_version = 21; screen->max_gl_es1_version = 11; screen->max_gl_es2_version = 20; break; case 3: { - bool has_fragment_shader = driQueryOptionb(&screen->optionCache, "fragment_shader"); - bool has_occlusion_query = driQueryOptionb(&screen->optionCache, "stub_occlusion_query"); - screen->max_gl_core_version = 0; screen->max_gl_es1_version = 11; - - if (has_fragment_shader && has_occlusion_query) { - screen->max_gl_compat_version = 21; - } else { - screen->max_gl_compat_version = 14; - } - - if (has_fragment_shader) { - screen->max_gl_es2_version = 20; - } else { - screen->max_gl_es2_version = 0; - } + screen->max_gl_compat_version = 21; + screen->max_gl_es2_version = 20; break; } case 2: screen->max_gl_core_version = 0; screen->max_gl_compat_version = 13; |