fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-19 14:58:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

turnip: correctly emit non-binning vs in transform feedback case

Browse source 
The offset given to tu6_emit_shader_object was wrong, binning_vs_offset
should only be used when using the binning pass vs.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5370>
This commit is contained in:
Jonathan Marek 2020-06-06 11:21:58 -04:00
parent 6cc95abb27
commit 6ac4d778fa
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/freedreno/vulkan/tu_pipeline.c
View file

@ -1572,6 +1572,7 @@ tu6_emit_program(struct tu_cs *cs,
builder->shaders[MESA_SHADER_FRAGMENT]
? &builder->shaders[MESA_SHADER_FRAGMENT]->variants[0]
: &dummy_variant;
uint32_t vs_offset = builder->shader_offsets[MESA_SHADER_VERTEX];
bool has_gs = gs->type != MESA_SHADER_NONE;
if (binning_pass) {
@ -1579,8 +1580,10 @@ tu6_emit_program(struct tu_cs *cs,
* binning pass VS will have outputs on other than position/psize
* stripped out:
*/
if (vs->shader->stream_output.num_outputs == 0)
if (vs->shader->stream_output.num_outputs == 0) {
vs = &builder->shaders[MESA_SHADER_VERTEX]->variants[1];
vs_offset = builder->binning_vs_offset;
}
fs = &dummy_variant;
}
@ -1600,8 +1603,7 @@ tu6_emit_program(struct tu_cs *cs,
builder->use_dual_src_blend,
builder->render_components);
tu6_emit_shader_object(cs, MESA_SHADER_VERTEX, vs, binary_bo,
binning_pass ? builder->binning_vs_offset : builder->shader_offsets[MESA_SHADER_VERTEX]);
tu6_emit_shader_object(cs, MESA_SHADER_VERTEX, vs, binary_bo, vs_offset);
if (has_gs)
tu6_emit_shader_object(cs, MESA_SHADER_GEOMETRY, gs, binary_bo,
builder->shader_offsets[MESA_SHADER_GEOMETRY]);