diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2017-08-17 13:42:06 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2017-08-22 15:16:44 +0200 |
| commit | c7ad07758e04323a9a5f38e063de95f5d74900ba (patch) | |
| tree | 1cdd0c2dfab9e12f5cc78d47563bf833bd93f54b | |
| parent | 8f75a6f1af0bdc71a257b48bf65501cb4cd54065 (diff) | |
gallium/u_simple_shaders: do util_make_layered_clear_vertex_shader differently
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Tested-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_simple_shaders.c | 40 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_simple_shaders.h | 2 |
3 files changed, 19 insertions, 25 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 630fe1102e..3ee1ba3ddd 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -345,7 +345,7 @@ static void bind_vs_pos_only(struct blitter_context_priv *ctx, ctx->vs_pos_only[index] = util_make_vertex_passthrough_shader_with_so(pipe, 1, semantic_names, semantic_indices, FALSE, - &so); + false, &so); } pipe->bind_vs_state(pipe, ctx->vs_pos_only[index]); diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c index 127bb7a75d..967954596b 100644 --- a/src/gallium/auxiliary/util/u_simple_shaders.c +++ b/src/gallium/auxiliary/util/u_simple_shaders.c @@ -66,7 +66,7 @@ util_make_vertex_passthrough_shader(struct pipe_context *pipe, return util_make_vertex_passthrough_shader_with_so(pipe, num_attribs, semantic_names, semantic_indexes, - window_space, NULL); + window_space, false, NULL); } void * @@ -74,7 +74,7 @@ util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe, uint num_attribs, const uint *semantic_names, const uint *semantic_indexes, - bool window_space, + bool window_space, bool layered, const struct pipe_stream_output_info *so) { struct ureg_program *ureg; @@ -100,6 +100,15 @@ util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe, ureg_MOV( ureg, dst, src ); } + if (layered) { + struct ureg_src instance_id = + ureg_DECL_system_value(ureg, TGSI_SEMANTIC_INSTANCEID, 0); + struct ureg_dst layer = ureg_DECL_output(ureg, TGSI_SEMANTIC_LAYER, 0); + + ureg_MOV(ureg, ureg_writemask(layer, TGSI_WRITEMASK_X), + ureg_scalar(instance_id, TGSI_SWIZZLE_X)); + } + ureg_END( ureg ); return ureg_create_shader_with_so_and_destroy( ureg, pipe, so ); @@ -108,28 +117,13 @@ util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe, void *util_make_layered_clear_vertex_shader(struct pipe_context *pipe) { - static const char text[] = - "VERT\n" - "DCL IN[0]\n" - "DCL IN[1]\n" - "DCL SV[0], INSTANCEID\n" - "DCL OUT[0], POSITION\n" - "DCL OUT[1], GENERIC[0]\n" - "DCL OUT[2], LAYER\n" + const unsigned semantic_names[] = {TGSI_SEMANTIC_POSITION, + TGSI_SEMANTIC_GENERIC}; + const unsigned semantic_indices[] = {0, 0}; - "MOV OUT[0], IN[0]\n" - "MOV OUT[1], IN[1]\n" - "MOV OUT[2].x, SV[0].xxxx\n" - "END\n"; - struct tgsi_token tokens[1000]; - struct pipe_shader_state state; - - if (!tgsi_text_translate(text, tokens, ARRAY_SIZE(tokens))) { - assert(0); - return NULL; - } - pipe_shader_state_from_tgsi(&state, tokens); - return pipe->create_vs_state(pipe, &state); + return util_make_vertex_passthrough_shader_with_so(pipe, 2, semantic_names, + semantic_indices, false, + true, NULL); } /** diff --git a/src/gallium/auxiliary/util/u_simple_shaders.h b/src/gallium/auxiliary/util/u_simple_shaders.h index aadc7af9e8..a281f573a4 100644 --- a/src/gallium/auxiliary/util/u_simple_shaders.h +++ b/src/gallium/auxiliary/util/u_simple_shaders.h @@ -56,7 +56,7 @@ util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe, uint num_attribs, const uint *semantic_names, const uint *semantic_indexes, - bool window_space, + bool window_space, bool layered, const struct pipe_stream_output_info *so); extern void * |