Mesa (master): mesa/st: translate SO info in glsl_to_nir() case
Timothy Arceri
tarceri at kemper.freedesktop.org
Thu Jan 18 04:38:16 UTC 2018
Module: Mesa
Branch: master
Commit: 4c69961daf45a6a64970e5831bd362307dca0cb2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c69961daf45a6a64970e5831bd362307dca0cb2
Author: Rob Clark <robdclark at gmail.com>
Date: Wed Jan 10 03:54:14 2018 +0100
mesa/st: translate SO info in glsl_to_nir() case
This was handled for VS, but not for GS.
Fixes for gallium drivers using nir:
spec at arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations
spec at arb_gpu_shader5@arb_gpu_shader5-xfb-streams*
spec at arb_transform_feedback3@arb_transform_feedback3-ext_interleaved_two_bufs_gs*
spec at ext_transform_feedback@geometry-shaders-basic
spec at ext_transform_feedback@* use_gs
spec at glsl-1.50@execution at geometry@primitive-id*
spec at glsl-1.50@execution at geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip *
spec at glsl-1.50@transform-feedback-builtins
spec at glsl-1.50@transform-feedback-type-and-size
v2: don't call st_translate_program_stream_output) for TCS
v3: drop scanning patch outputs as TCS can't output xfb
Signed-off-by: Rob Clark <robdclark at gmail.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Tested-by: Karol Herbst <kherbst at redhat.com>
---
src/mesa/state_tracker/st_program.c | 47 +++++++++++++++++++++++++++++++++----
1 file changed, 43 insertions(+), 4 deletions(-)
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 77136edbb9..883813d6c0 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -1425,6 +1425,40 @@ 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;
+ }
+ }
+
+ st_translate_stream_output_info2(prog->sh.LinkedTransformFeedback,
+ outputMapping,
+ stream_output);
+}
/**
* Translate a geometry program to create a new variant.
@@ -1436,8 +1470,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)
@@ -1493,6 +1529,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 */
@@ -1533,7 +1570,7 @@ st_translate_tessctrl_program(struct st_context *st,
{
struct ureg_program *ureg;
- /* We have already compiler to NIR so just return */
+ /* We have already compiled to NIR so just return */
if (sttcp->shader_program)
return true;
@@ -1562,9 +1599,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)
More information about the mesa-commit
mailing list