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

driconf: add force_glsl_abs_sqrt option

Browse Source 
This will allow to force computing the absolute value for sqrt()
and inversesqrt() in order to follow D3D9 behaviour for buggy
apps that rely on it.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Samuel Pitoiset
2017-03-17 01:06:54 +01:00
parent 08f864abd9
commit 448f4c0c89
7 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/include/state_tracker/st_api.h
View File

@@ -248,6 +248,7 @@ struct st_config_options
boolean allow_glsl_extension_directive_midshader; boolean allow_glsl_extension_directive_midshader;
boolean allow_higher_compat_version; boolean allow_higher_compat_version;
boolean glsl_zero_init; boolean glsl_zero_init;
boolean force_glsl_abs_sqrt;
unsigned char config_options_sha1[20]; unsigned char config_options_sha1[20];
}; };

3
src/gallium/state_trackers/dri/dri_screen.c
View File

@@ -76,6 +76,7 @@ const __DRIconfigOptionsExtension gallium_config_options = {
DRI_CONF_FORCE_GLSL_VERSION(0) DRI_CONF_FORCE_GLSL_VERSION(0)
DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false") DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false")
DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false") DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false")
DRI_CONF_FORCE_GLSL_ABS_SQRT("false")
DRI_CONF_SECTION_END DRI_CONF_SECTION_END
DRI_CONF_SECTION_MISCELLANEOUS DRI_CONF_SECTION_MISCELLANEOUS
@@ -110,6 +111,8 @@ dri_fill_st_options(struct dri_screen *screen)
options->allow_higher_compat_version = options->allow_higher_compat_version =
driQueryOptionb(optionCache, "allow_higher_compat_version"); driQueryOptionb(optionCache, "allow_higher_compat_version");
options->glsl_zero_init = driQueryOptionb(optionCache, "glsl_zero_init"); options->glsl_zero_init = driQueryOptionb(optionCache, "glsl_zero_init");
options->force_glsl_abs_sqrt =
driQueryOptionb(optionCache, "force_glsl_abs_sqrt");
driComputeOptionsSha1(optionCache, options->config_options_sha1); driComputeOptionsSha1(optionCache, options->config_options_sha1);
} }

5
src/mesa/drivers/dri/common/xmlpool/t_options.h
View File

@@ -120,6 +120,11 @@ DRI_CONF_OPT_BEGIN_B(allow_higher_compat_version, def) \
DRI_CONF_DESC(en,gettext("Allow a higher compat profile (version 3.1+) for apps that request it")) \ DRI_CONF_DESC(en,gettext("Allow a higher compat profile (version 3.1+) for apps that request it")) \
DRI_CONF_OPT_END DRI_CONF_OPT_END
#define DRI_CONF_FORCE_GLSL_ABS_SQRT(def) \
DRI_CONF_OPT_BEGIN_B(force_glsl_abs_sqrt, def) \
DRI_CONF_DESC(en,gettext("Force computing the absolute value for sqrt() and inversesqrt()")) \
DRI_CONF_OPT_END
/** /**

3
src/mesa/drivers/dri/i965/brw_context.c
View File

@@ -937,6 +937,9 @@ brw_process_driconf_options(struct brw_context *brw)
ctx->Const.AllowHigherCompatVersion = ctx->Const.AllowHigherCompatVersion =
driQueryOptionb(options, "allow_higher_compat_version"); driQueryOptionb(options, "allow_higher_compat_version");
ctx->Const.ForceGLSLAbsSqrt =
driQueryOptionb(options, "force_glsl_abs_sqrt");
ctx->Const.GLSLZeroInit = driQueryOptionb(options, "glsl_zero_init"); ctx->Const.GLSLZeroInit = driQueryOptionb(options, "glsl_zero_init");
brw->dual_color_blend_by_location = brw->dual_color_blend_by_location =

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

@@ -90,6 +90,7 @@ DRI_CONF_BEGIN
DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION("false") DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION("false")
DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false") DRI_CONF_ALLOW_GLSL_EXTENSION_DIRECTIVE_MIDSHADER("false")
DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false") DRI_CONF_ALLOW_HIGHER_COMPAT_VERSION("false")
DRI_CONF_FORCE_GLSL_ABS_SQRT("false")
DRI_CONF_OPT_BEGIN_B(shader_precompile, "true") DRI_CONF_OPT_BEGIN_B(shader_precompile, "true")
DRI_CONF_DESC(en, "Perform code generation at shader link time.") DRI_CONF_DESC(en, "Perform code generation at shader link time.")

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

@@ -3555,6 +3555,12 @@ struct gl_constants
*/ */
GLboolean AllowHigherCompatVersion; GLboolean AllowHigherCompatVersion;
/**
* Force computing the absolute value for sqrt() and inversesqrt() to follow
* D3D9 when apps rely on this behaviour.
*/
GLboolean ForceGLSLAbsSqrt;
/** /**
* Force uninitialized variables to default to zero. * Force uninitialized variables to default to zero.
*/ */

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

@@ -881,6 +881,8 @@ void st_init_extensions(struct pipe_screen *screen,
consts->AllowHigherCompatVersion = options->allow_higher_compat_version; consts->AllowHigherCompatVersion = options->allow_higher_compat_version;
consts->ForceGLSLAbsSqrt = options->force_glsl_abs_sqrt;
consts->dri_config_options_sha1 = options->config_options_sha1; consts->dri_config_options_sha1 = options->config_options_sha1;
if (consts->GLSLVersion >= 400) if (consts->GLSLVersion >= 400)