fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno: Fix assertion failures on GS/tess shaders with shader-db enabled.

Browse source 
We weren't filling in the tess mode of the key, or setting has_gs on GS
shaders, resulting in assertion failures when NIR intrinsics didn't get
lowered.

We have to make a guess at prim mode for TCS, but it should be better to
have some shader-db coverage than none, and it will avoid these failures
happening when we start precompiling shaders.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4562>
This commit is contained in:
Eric Anholt 2020-04-15 14:21:07 -07:00 • committed by Marge Bot
parent f91e49ee29
commit 05be0659fe
3 changed files with 45 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/freedreno/ir3/ir3_shader.h
View file

@ -288,6 +288,21 @@ struct ir3_shader_key {
uint16_t vastc_srgb, fastc_srgb;
};
static inline unsigned
ir3_tess_mode(unsigned gl_tess_mode)
{
switch (gl_tess_mode) {
case GL_ISOLINES:
return IR3_TESS_ISOLINES;
case GL_TRIANGLES:
return IR3_TESS_TRIANGLES;
case GL_QUADS:
return IR3_TESS_QUADS;
default:
unreachable("bad tessmode");
}
}
static inline bool
ir3_shader_key_equal(struct ir3_shader_key *a, struct ir3_shader_key *b)
{

14
src/gallium/drivers/freedreno/a6xx/fd6_draw.c
View file

@ -182,19 +182,7 @@ fd6_draw_vbo(struct fd_context *ctx, const struct pipe_draw_info *info,
emit.key.ds = ctx->prog.ds;
shader_info *ds_info = &emit.key.ds->nir->info;
switch (ds_info->tess.primitive_mode) {
case GL_ISOLINES:
emit.key.key.tessellation = IR3_TESS_ISOLINES;
break;
case GL_TRIANGLES:
emit.key.key.tessellation = IR3_TESS_TRIANGLES;
break;
case GL_QUADS:
emit.key.key.tessellation = IR3_TESS_QUADS;
break;
default:
unreachable("bad tessmode");
}
emit.key.key.tessellation = ir3_tess_mode(ds_info->tess.primitive_mode);
}
if (emit.key.gs)

30
src/gallium/drivers/freedreno/ir3/ir3_gallium.c
View file

@ -141,7 +141,35 @@ ir3_shader_create(struct ir3_compiler *compiler,
* (as otherwise nothing will trigger the shader to be
* actually compiled)
*/
static struct ir3_shader_key key; /* static is implicitly zeroed */
struct ir3_shader_key key = {
.tessellation = IR3_TESS_NONE,
};
switch (nir->info.stage) {
case MESA_SHADER_TESS_EVAL:
key.tessellation = ir3_tess_mode(nir->info.tess.primitive_mode);
break;
case MESA_SHADER_TESS_CTRL:
/* The primitive_mode field, while it exists for TCS, is not
* populated (since separable shaders between TCS/TES are legal,
* so TCS wouldn't have access to TES's declaration). Make a
* guess so that we shader-db something plausible for TCS.
*/
if (nir->info.outputs_written & VARYING_BIT_TESS_LEVEL_INNER)
key.tessellation = IR3_TESS_TRIANGLES;
else
key.tessellation = IR3_TESS_ISOLINES;
break;
case MESA_SHADER_GEOMETRY:
key.has_gs = true;
break;
default:
break;
}
ir3_shader_variant(shader, key, false, debug);
if (nir->info.stage == MESA_SHADER_VERTEX)