KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/a6xx: fix binning pass vs. xfb 

We could bit doing streamout from binning pass.  In this case we want to
use the full VS which doesn't have (potentially streamed out) varyings
stripped out.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Rob Clark 2019-09-20 13:50:21 -07:00 committed by Rob Clark
parent 331f89a971
commit b9bf374512
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gallium/drivers/freedreno/a6xx/fd6_program.c
View File

@ -321,7 +321,7 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
struct ir3_shader_linkage l = {0};
ir3_link_shaders(&l, vs, fs);
if ((vs->shader->stream_output.num_outputs > 0) && !binning_pass)
if (vs->shader->stream_output.num_outputs > 0)
link_stream_out(&l, vs);
BITSET_DECLARE(varbs, 128) = {0};
@ -348,7 +348,7 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
ir3_link_add(&l, psize_regid, 0x1, l.max_loc);
}
if ((vs->shader->stream_output.num_outputs > 0) && !binning_pass) {
if (vs->shader->stream_output.num_outputs > 0) {
setup_stream_out(state, vs, &l);
}
@ -656,7 +656,11 @@ fd6_program_create(void *data, struct ir3_shader_variant *bs,
struct fd_context *ctx = data;
struct fd6_program_state *state = CALLOC_STRUCT(fd6_program_state);
state->bs = bs;
/* if we have streamout, use full VS in binning pass, as the
* binning pass VS will have outputs on other than position/psize
* stripped out:
*/
state->bs = vs->shader->stream_output.num_outputs ? vs : bs;
state->vs = vs;
state->fs = fs;
state->config_stateobj = fd_ringbuffer_new_object(ctx->pipe, 0x1000);