st/dri: support the driconf option disable_blend_func_extended
This is needed for Unigine. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
@@ -241,6 +241,7 @@ struct st_config_options
|
||||
{
|
||||
boolean force_glsl_extensions_warn;
|
||||
boolean disable_glsl_line_continuations;
|
||||
boolean disable_blend_func_extended;
|
||||
};
|
||||
|
||||
/**
|
||||
|
@@ -56,6 +56,8 @@ static void dri_fill_st_options(struct st_config_options *options,
|
||||
driQueryOptionb(optionCache, "force_glsl_extensions_warn");
|
||||
options->disable_glsl_line_continuations =
|
||||
driQueryOptionb(optionCache, "disable_glsl_line_continuations");
|
||||
options->disable_blend_func_extended =
|
||||
driQueryOptionb(optionCache, "disable_blend_func_extended");
|
||||
}
|
||||
|
||||
GLboolean
|
||||
|
@@ -67,6 +67,7 @@ PUBLIC const char __driConfigOptions[] =
|
||||
DRI_CONF_SECTION_DEBUG
|
||||
DRI_CONF_FORCE_GLSL_EXTENSIONS_WARN("false")
|
||||
DRI_CONF_DISABLE_GLSL_LINE_CONTINUATIONS("false")
|
||||
DRI_CONF_DISABLE_BLEND_FUNC_EXTENDED("false")
|
||||
DRI_CONF_SECTION_END
|
||||
|
||||
DRI_CONF_SECTION_MISCELLANEOUS
|
||||
@@ -76,7 +77,7 @@ PUBLIC const char __driConfigOptions[] =
|
||||
|
||||
#define false 0
|
||||
|
||||
static const uint __driNConfigOptions = 12;
|
||||
static const uint __driNConfigOptions = 13;
|
||||
|
||||
static const __DRIconfig **
|
||||
dri_fill_in_modes(struct dri_screen *screen)
|
||||
|
@@ -543,6 +543,7 @@ OSMesaCreateContextExt(GLenum format, GLint depthBits, GLint stencilBits,
|
||||
attribs.minor = 1;
|
||||
attribs.flags = 0; /* ST_CONTEXT_FLAG_x */
|
||||
attribs.options.force_glsl_extensions_warn = FALSE;
|
||||
attribs.options.disable_blend_func_extended = FALSE;
|
||||
attribs.options.disable_glsl_line_continuations = FALSE;
|
||||
|
||||
osmesa_init_st_visual(&attribs.visual,
|
||||
|
@@ -713,7 +713,8 @@ void st_init_extensions(struct st_context *st)
|
||||
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;
|
||||
|
||||
st->has_time_elapsed =
|
||||
|
Reference in New Issue
Block a user