summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2018-09-13 15:39:43 +0200
committerSamuel Pitoiset <[email protected]>2018-10-29 17:09:08 +0100
commit8e428e24a833175c108e4151676a85a31bd99efd (patch)
treef17831e1da7b4d95a7b457a2c7fb150e31e87ab6
parentdd996d1885a092027153c992be7c9919ea9a3792 (diff)
radv: gather which GS stream is used for every outputs
To only emit outputs for the given stream. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Dave Airlie <[email protected]>
-rw-r--r--src/amd/vulkan/radv_shader.h1
-rw-r--r--src/amd/vulkan/radv_shader_info.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index c199b3c27af..6511538dace 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -160,6 +160,7 @@ struct radv_shader_info {
struct {
uint8_t output_usage_mask[VARYING_SLOT_VAR31 + 1];
uint8_t num_stream_output_components[4];
+ uint8_t output_streams[VARYING_SLOT_VAR31 + 1];
uint8_t max_stream;
} gs;
struct {
diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 126785120d9..29f5f68a328 100644
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -440,11 +440,13 @@ gather_info_output_decl_gs(const nir_shader *nir, const nir_variable *var,
{
unsigned num_components = glsl_get_component_slots(var->type);
unsigned stream = var->data.stream;
+ unsigned idx = var->data.location;
assert(stream < 4);
info->gs.max_stream = MAX2(info->gs.max_stream, stream);
info->gs.num_stream_output_components[stream] += num_components;
+ info->gs.output_streams[idx] = stream;
}
static void