Reviewed-by: Timothy Arceri <tarc...@itsqueeze.com>
On 09/01/18 02:41, Karol Herbst wrote:
From: Rob Clark <robdcl...@gmail.com> This was handled for VS, but not for GS. Fixes for gallium drivers using nir: spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams* spec@arb_transform_feedback3@arb_transform_feedback3-ext_interleaved_two_bufs_gs* spec@ext_transform_feedback@geometry-shaders-basic spec@ext_transform_feedback@* use_gs spec@glsl-1.50@execution@geometry@primitive-id* spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip * spec@glsl-1.50@transform-feedback-builtins spec@glsl-1.50@transform-feedback-type-and-size Signed-off-by: Rob Clark <robdcl...@gmail.com> Tested-by: Karol Herbst <kher...@redhat.com> Cc: Rob Clark <robdcl...@gmail.com> Cc: Timothy Arceri <tarc...@itsqueeze.com> --- src/mesa/state_tracker/st_program.c | 61 ++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 05e6042f42..5efd83d5a8 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -1421,6 +1421,50 @@ st_translate_program_common(struct st_context *st, } }+/**+ * Update stream-output info for GS/TCS/TES. Normally this is done in + * st_translate_program_common() but that is not called for glsl_to_nir + * case. + */ +static void +st_translate_program_stream_output(struct gl_program *prog, + struct pipe_stream_output_info *stream_output) +{ + if (!prog->sh.LinkedTransformFeedback) + return; + + ubyte outputMapping[VARYING_SLOT_TESS_MAX]; + GLuint attr; + uint num_outputs = 0; + + memset(outputMapping, 0, sizeof(outputMapping)); + + /* + * Determine number of outputs, the (default) output register + * mapping and the semantic information for each output. + */ + for (attr = 0; attr < VARYING_SLOT_MAX; attr++) { + if (prog->info.outputs_written & BITFIELD64_BIT(attr)) { + GLuint slot = num_outputs++; + + outputMapping[attr] = slot; + } + } + + /* Also add patch outputs. */ + for (attr = 0; attr < 32; attr++) { + if (prog->info.patch_outputs_written & (1u << attr)) { + GLuint slot = num_outputs++; + GLuint patch_attr = VARYING_SLOT_PATCH0 + attr; + + outputMapping[patch_attr] = slot; + } + } + + st_translate_stream_output_info2(prog->sh.LinkedTransformFeedback, + outputMapping, + stream_output); +}/*** Translate a geometry program to create a new variant. @@ -1432,8 +1476,10 @@ st_translate_geometry_program(struct st_context *st, struct ureg_program *ureg;/* We have already compiled to NIR so just return */- if (stgp->shader_program) + if (stgp->shader_program) { + st_translate_program_stream_output(&stgp->Base, &stgp->tgsi.stream_output); return true; + }ureg = ureg_create_with_screen(PIPE_SHADER_GEOMETRY, st->pipe->screen);if (ureg == NULL) @@ -1489,6 +1535,7 @@ st_get_basic_variant(struct st_context *st, tgsi.ir.nir = nir_shader_clone(NULL, prog->tgsi.ir.nir); st_finalize_nir(st, &prog->Base, prog->shader_program, tgsi.ir.nir); + tgsi.stream_output = prog->tgsi.stream_output; } else tgsi = prog->tgsi; /* fill in new variant */ @@ -1529,9 +1576,11 @@ st_translate_tessctrl_program(struct st_context *st, { struct ureg_program *ureg;- /* We have already compiler to NIR so just return */- if (sttcp->shader_program) + /* We have already compiled to NIR so just return */ + if (sttcp->shader_program) { + st_translate_program_stream_output(&sttcp->Base, &sttcp->tgsi.stream_output); return true; + }ureg = ureg_create_with_screen(PIPE_SHADER_TESS_CTRL, st->pipe->screen);if (ureg == NULL) @@ -1558,9 +1607,11 @@ st_translate_tesseval_program(struct st_context *st, { struct ureg_program *ureg;- /* We have already compiler to NIR so just return */- if (sttep->shader_program) + /* We have already compiled to NIR so just return */ + if (sttep->shader_program) { + st_translate_program_stream_output(&sttep->Base, &sttep->tgsi.stream_output); return true; + }ureg = ureg_create_with_screen(PIPE_SHADER_TESS_EVAL, st->pipe->screen);if (ureg == NULL)
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
