diff options
author | Eric Engestrom <eric.engestrom@intel.com> | 2019-07-23 10:01:44 +0100 |
---|---|---|
committer | Eric Engestrom <eric.engestrom@intel.com> | 2019-07-24 09:33:29 +0100 |
commit | e7e31b18d606ed25e3faab5969b6b52cd9f90162 (patch) | |
tree | 2dce90710be47e89d3a57b516a0f7d211f8ff797 /src/mesa/state_tracker | |
parent | f986741a91b80091b510752b707a82f5b19440ee (diff) |
gallium+mesa: fix tgsi_semantic array type
Fixes: ed23335a313dfc9cec26 ("gallium: use enums in p_shader_tokens.h (v2)")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r-- | src/mesa/state_tracker/st_cb_clear.c | 6 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_cb_drawpixels.c | 10 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_cb_drawtex.c | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c index 3a49bd4d6c1..593d15331fd 100644 --- a/src/mesa/state_tracker/st_cb_clear.c +++ b/src/mesa/state_tracker/st_cb_clear.c @@ -176,8 +176,10 @@ set_vertex_shader(struct st_context *st) if (use_nir) { st->clear.vs = make_nir_clear_vertex_shader(st, false); } else { - const uint semantic_names[] = { TGSI_SEMANTIC_POSITION, - TGSI_SEMANTIC_GENERIC }; + const enum tgsi_semantic semantic_names[] = { + TGSI_SEMANTIC_POSITION, + TGSI_SEMANTIC_GENERIC + }; const uint semantic_indexes[] = { 0, 0 }; st->clear.vs = util_make_vertex_passthrough_shader(st->pipe, 2, semantic_names, diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index 26d3cc33e5c..d1042080e0f 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -324,10 +324,12 @@ st_make_passthrough_vertex_shader(struct st_context *st) MESA_SHADER_VERTEX, 3, inputs, outputs, NULL, 0); } else { - const uint semantic_names[] = { TGSI_SEMANTIC_POSITION, - TGSI_SEMANTIC_COLOR, - st->needs_texcoord_semantic ? TGSI_SEMANTIC_TEXCOORD : - TGSI_SEMANTIC_GENERIC }; + const enum tgsi_semantic semantic_names[] = { + TGSI_SEMANTIC_POSITION, + TGSI_SEMANTIC_COLOR, + st->needs_texcoord_semantic ? TGSI_SEMANTIC_TEXCOORD : + TGSI_SEMANTIC_GENERIC + }; const uint semantic_indexes[] = { 0, 0, 0 }; st->passthrough_vs = diff --git a/src/mesa/state_tracker/st_cb_drawtex.c b/src/mesa/state_tracker/st_cb_drawtex.c index f08ffde6b01..bba1ce41376 100644 --- a/src/mesa/state_tracker/st_cb_drawtex.c +++ b/src/mesa/state_tracker/st_cb_drawtex.c @@ -92,7 +92,7 @@ semantic_to_varying_slot(unsigned semantic) static void * lookup_shader(struct st_context *st, uint num_attribs, - const uint *semantic_names, + const enum tgsi_semantic *semantic_names, const uint *semantic_indexes) { struct pipe_context *pipe = st->pipe; @@ -168,7 +168,7 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, struct pipe_resource *vbuffer = NULL; GLuint i, numTexCoords, numAttribs; GLboolean emitColor; - uint semantic_names[2 + MAX_TEXTURE_UNITS]; + enum tgsi_semantic semantic_names[2 + MAX_TEXTURE_UNITS]; uint semantic_indexes[2 + MAX_TEXTURE_UNITS]; struct pipe_vertex_element velements[2 + MAX_TEXTURE_UNITS]; unsigned offset; |