[Mesa-dev] [PATCH 91/92] radeonsi: VS as ES/LS are not yet supported with R600_DEBUG=nir

Nicolai Hähnle nhaehnle at gmail.com
Mon Jun 26 14:19:20 UTC 2017


From: Nicolai Hähnle <nicolai.haehnle at amd.com>

---
 src/gallium/drivers/radeonsi/si_shader.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 91bc067..86423d8 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -4245,22 +4245,24 @@ static void create_function(struct si_shader_context *ctx)
 	}
 
 	LLVMTypeRef v3i32 = LLVMVectorType(ctx->i32, 3);
 
 	switch (type) {
 	case PIPE_SHADER_VERTEX:
 		declare_default_desc_pointers(ctx, params, &num_params);
 		declare_vs_specific_input_sgprs(ctx, params, &num_params);
 
 		if (shader->key.as_es) {
+			assert(!shader->selector->nir);
 			params[ctx->param_es2gs_offset = num_params++] = ctx->i32;
 		} else if (shader->key.as_ls) {
+			assert(!shader->selector->nir);
 			/* no extra parameters */
 		} else {
 			if (shader->is_gs_copy_shader)
 				num_params = ctx->param_rw_buffers + 1;
 
 			/* The locations of the other parameters are assigned dynamically. */
 			declare_streamout_params(ctx, &shader->selector->so,
 						 params, ctx->i32, &num_params);
 		}
 
-- 
2.9.3



More information about the mesa-dev mailing list