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

st/mesa: expose 0 shader binary formats for compat profiles for Qt

Browse Source 
Bugzilla: https://bugreports.qt.io/browse/QTBUG-66420
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105065
Cc: "18.0" <mesa-stable@lists.freedesktop.org>
Tested-by: Kai Wasserbäch <kai@dev.carbon-project.org>
This commit is contained in:
Marek Olšák
2018-02-23 20:42:41 +01:00
parent 8ba3750d3d
commit 55376cb31e
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -468,7 +468,7 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
? true : false; ? true : false;
/* GL limits and extensions */ /* GL limits and extensions */
st_init_limits(pipe->screen, &ctx->Const, &ctx->Extensions); st_init_limits(pipe->screen, &ctx->Const, &ctx->Extensions, ctx->API);
st_init_extensions(pipe->screen, &ctx->Const, st_init_extensions(pipe->screen, &ctx->Const,
&ctx->Extensions, &st->options, ctx->API); &ctx->Extensions, &st->options, ctx->API);

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

@@ -75,7 +75,8 @@ static int _clamp(int a, int min, int max)
* Note that we have to limit/clamp against Mesa's internal limits too. * Note that we have to limit/clamp against Mesa's internal limits too.
*/ */
void st_init_limits(struct pipe_screen *screen, void st_init_limits(struct pipe_screen *screen,
struct gl_constants *c, struct gl_extensions *extensions) struct gl_constants *c, struct gl_extensions *extensions,
gl_api api)
{ {
int supported_irs; int supported_irs;
unsigned sh; unsigned sh;
@@ -437,8 +438,14 @@ void st_init_limits(struct pipe_screen *screen,
c->GLSLFrontFacingIsSysVal = c->GLSLFrontFacingIsSysVal =
screen->get_param(screen, PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL); screen->get_param(screen, PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL);
/* GL_ARB_get_program_binary */ /* GL_ARB_get_program_binary
if (screen->get_disk_shader_cache && screen->get_disk_shader_cache(screen)) *
* The QT framework has a bug in their shader program cache, which is built
* on GL_ARB_get_program_binary. In an effort to allow them to fix the bug
* we don't enable more than 1 binary format for compatibility profiles.
*/
if (api != API_OPENGL_COMPAT &&
screen->get_disk_shader_cache && screen->get_disk_shader_cache(screen))
c->NumProgramBinaryFormats = 1; c->NumProgramBinaryFormats = 1;
c->MaxAtomicBufferBindings = c->MaxAtomicBufferBindings =

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

@@ -35,7 +35,8 @@ struct pipe_screen;
extern void st_init_limits(struct pipe_screen *screen, extern void st_init_limits(struct pipe_screen *screen,
struct gl_constants *c, struct gl_constants *c,
struct gl_extensions *extensions); struct gl_extensions *extensions,
gl_api api);
extern void st_init_extensions(struct pipe_screen *screen, extern void st_init_extensions(struct pipe_screen *screen,
struct gl_constants *consts, struct gl_constants *consts,

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

@@ -1207,7 +1207,7 @@ get_version(struct pipe_screen *screen,
_mesa_init_constants(&consts, api); _mesa_init_constants(&consts, api);
_mesa_init_extensions(&extensions); _mesa_init_extensions(&extensions);
st_init_limits(screen, &consts, &extensions); st_init_limits(screen, &consts, &extensions, api);
st_init_extensions(screen, &consts, &extensions, options, api); st_init_extensions(screen, &consts, &extensions, options, api);
return _mesa_get_version(&extensions, &consts, api); return _mesa_get_version(&extensions, &consts, api);