fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-26 11:10:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "i915: Always enable GL 2.0 support."

Browse source 
This partially reverts commit 97217a40f9.
It leaves ES 2.0 support in place per Ian's suggestion, because ES 2.0
is designed to work on hardware like i915.

Chrome only uses the GPU if you have GL >= 2.0, and using i915 (and
prog_execute) actually hurt performance compared with the software
paths.
This commit is contained in:
Matt Turner 2017-01-29 18:20:10 -08:00
parent 656e30b686
commit a1891da7c8
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/dri/i915/intel_extensions.c
View file

@ -92,8 +92,12 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ATI_separate_stencil = true;
ctx->Extensions.ATI_texture_env_combine3 = true;
ctx->Extensions.NV_texture_env_combine4 = true;
ctx->Extensions.ARB_fragment_shader = true;
ctx->Extensions.ARB_occlusion_query = 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;
}
if (intel->ctx.Mesa_DXTn

21
src/mesa/drivers/dri/i915/intel_screen.c
View file

@ -62,6 +62,10 @@ DRI_CONF_BEGIN
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")
@ -75,6 +79,10 @@ DRI_CONF_BEGIN
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
@ -1125,12 +1133,21 @@ set_max_gl_versions(struct intel_screen *screen)
__DRIscreen *psp = screen->driScrnPriv;
switch (screen->gen) {
case 3:
case 3: {
bool has_fragment_shader = driQueryOptionb(&screen->optionCache, "fragment_shader");
bool has_occlusion_query = driQueryOptionb(&screen->optionCache, "stub_occlusion_query");
psp->max_gl_core_version = 0;
psp->max_gl_es1_version = 11;
psp->max_gl_compat_version = 21;
psp->max_gl_es2_version = 20;
if (has_fragment_shader && has_occlusion_query) {
psp->max_gl_compat_version = 21;
} else {
psp->max_gl_compat_version = 14;
}
break;
}
case 2:
psp->max_gl_core_version = 0;
psp->max_gl_compat_version = 13;