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

st/dri: support the driconf option disable_blend_func_extended

Browse Source 
This is needed for Unigine.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2013-07-30 22:29:16 +02:00
parent 71e0b5d688
commit 2acc27cc6d
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,8 +239,9 @@ struct st_visual
*/ */
struct st_config_options struct st_config_options
{ {
boolean force_glsl_extensions_warn; boolean force_glsl_extensions_warn;
boolean disable_glsl_line_continuations; boolean disable_glsl_line_continuations;
boolean disable_blend_func_extended;
}; };
/** /**

2
src/gallium/state_trackers/dri/common/dri_context.c
View File

@@ -56,6 +56,8 @@ static void dri_fill_st_options(struct st_config_options *options,
driQueryOptionb(optionCache, "force_glsl_extensions_warn"); driQueryOptionb(optionCache, "force_glsl_extensions_warn");
options->disable_glsl_line_continuations = options->disable_glsl_line_continuations =
driQueryOptionb(optionCache, "disable_glsl_line_continuations"); driQueryOptionb(optionCache, "disable_glsl_line_continuations");
options->disable_blend_func_extended =
driQueryOptionb(optionCache, "disable_blend_func_extended");
} }
GLboolean GLboolean

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

@@ -67,6 +67,7 @@ PUBLIC const char __driConfigOptions[] =
DRI_CONF_SECTION_DEBUG DRI_CONF_SECTION_DEBUG
DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false") DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false")
DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false") DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false")
DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false")
DRI_CONF_SECTION_END DRI_CONF_SECTION_END
DRI_CONF_SECTION_MISCELLANEOUS DRI_CONF_SECTION_MISCELLANEOUS
@@ -76,7 +77,7 @@ PUBLIC const char __driConfigOptions[] =
#define false 0 #define false 0
static const uint __driNConfigOptions = 12; static const uint __driNConfigOptions = 13;
static const __DRIconfig ** static const __DRIconfig **
dri_fill_in_modes(struct dri_screen *screen) dri_fill_in_modes(struct dri_screen *screen)

1
src/gallium/state_trackers/osmesa/osmesa.c
View File

@@ -543,6 +543,7 @@ OSMesaCreateContextExt(GLenum format, GLint depthBits, GLint stencilBits,
attribs.minor = 1; attribs.minor = 1;
attribs.flags = 0; /* ST_CONTEXT_FLAG_x */ attribs.flags = 0; /* ST_CONTEXT_FLAG_x */
attribs.options.force_glsl_extensions_warn = FALSE; attribs.options.force_glsl_extensions_warn = FALSE;
attribs.options.disable_blend_func_extended = FALSE;
attribs.options.disable_glsl_line_continuations = FALSE; attribs.options.disable_glsl_line_continuations = FALSE;
osmesa_init_st_visual(&attribs.visual, osmesa_init_st_visual(&attribs.visual,

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

@@ -713,7 +713,8 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.EXT_framebuffer_multisample_blit_scaled = GL_TRUE; ctx->Extensions.EXT_framebuffer_multisample_blit_scaled = GL_TRUE;
} }
if (ctx->Const.MaxDualSourceDrawBuffers > 0) if (ctx->Const.MaxDualSourceDrawBuffers > 0 &&
!st->options.disable_blend_func_extended)
ctx->Extensions.ARB_blend_func_extended = GL_TRUE; ctx->Extensions.ARB_blend_func_extended = GL_TRUE;
st->has_time_elapsed = st->has_time_elapsed =