gallium/util: s/uint/enum tgsi_semantic/ in simple shader code

Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
index bd5a97f7bf3971ab2c259268bde320f59044f6f1..4046ab1202b22e9215b25d0292d6da6fa6b61be6 100644 (file)
--- a/src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/src/gallium/auxiliary/util/u_simple_shaders.c
@@ -59,7 +59,7 @@
 void *
 util_make_vertex_passthrough_shader(struct pipe_context *pipe,
                                     uint num_attribs,
-                                    const uint *semantic_names,
+                                    const enum tgsi_semantic *semantic_names,
                                     const uint *semantic_indexes,
                                     bool window_space)
 {
@@ -72,7 +72,7 @@ util_make_vertex_passthrough_shader(struct pipe_context *pipe,
 void *
 util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe,
                                     uint num_attribs,
-                                    const uint *semantic_names,
+                                    const enum tgsi_semantic *semantic_names,
                                     const uint *semantic_indexes,
                                     bool window_space, bool layered,
                                    const struct pipe_stream_output_info *so)

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.h b/src/gallium/auxiliary/util/u_simple_shaders.h
index cec556f05cbd0d97a97eae77faf8cbb965d40677..3afe4cc050bb916d85ec981ccd5bb65bfff57f25 100644 (file)
--- a/src/gallium/auxiliary/util/u_simple_shaders.h
+++ b/src/gallium/auxiliary/util/u_simple_shaders.h
@@ -47,14 +47,14 @@ extern "C" {
 extern void *
 util_make_vertex_passthrough_shader(struct pipe_context *pipe,
                                     uint num_attribs,
-                                    const uint *semantic_names,
+                                    const enum tgsi_semantic *semantic_names,
                                     const uint *semantic_indexes,
                                     bool window_space);
 
 extern void *
 util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe,
                                     uint num_attribs,
-                                    const uint *semantic_names,
+                                    const enum tgsi_semantic *semantic_names,
                                     const uint *semantic_indexes,
                                     bool window_space, bool layered,
                                     const struct pipe_stream_output_info *so);

diff --git a/src/gallium/auxiliary/util/u_tests.c b/src/gallium/auxiliary/util/u_tests.c
index e8599e320313b4597d2ae3e6c2f27608fa202019..86eee6e68b1ac6f780ac3411820482d1cb164fda 100644 (file)
--- a/src/gallium/auxiliary/util/u_tests.c
+++ b/src/gallium/auxiliary/util/u_tests.c
@@ -147,7 +147,7 @@ util_set_passthrough_vertex_shader(struct cso_context *cso,
                                    struct pipe_context *ctx,
                                    bool window_space)
 {
-   static const uint vs_attribs[] = {
+   static const enum tgsi_semantic vs_attribs[] = {
       TGSI_SEMANTIC_POSITION,
       TGSI_SEMANTIC_GENERIC
    };

diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c
index 2ee544a41294399f82ab0cd228aa936468652315..df0e1301f5ef2a2e10a8743177f24beefe0f3d7c 100644 (file)
--- a/src/gallium/tests/trivial/quad-tex.c
+++ b/src/gallium/tests/trivial/quad-tex.c
@@ -263,8 +263,8 @@ static void init_prog(struct program *p)
 
        /* vertex shader */
        {
-               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 };
                p->vs = util_make_vertex_passthrough_shader(p->pipe, 2, semantic_names, semantic_indexes, FALSE);
        }

diff --git a/src/gallium/tests/trivial/tri.c b/src/gallium/tests/trivial/tri.c
index a2031696f029a7dd5324bcae4bdfec37e3c88b2c..71e9702275232a7c7c7715bd90366663d76a76a7 100644 (file)
--- a/src/gallium/tests/trivial/tri.c
+++ b/src/gallium/tests/trivial/tri.c
@@ -208,10 +208,10 @@ static void init_prog(struct program *p)
 
        /* vertex shader */
        {
-                       const uint semantic_names[] = { TGSI_SEMANTIC_POSITION,
-                                                       TGSI_SEMANTIC_COLOR };
-                       const uint semantic_indexes[] = { 0, 0 };
-                       p->vs = util_make_vertex_passthrough_shader(p->pipe, 2, semantic_names, semantic_indexes, FALSE);
+               const enum tgsi_semantic semantic_names[] =
+                       { TGSI_SEMANTIC_POSITION, TGSI_SEMANTIC_COLOR };
+               const uint semantic_indexes[] = { 0, 0 };
+               p->vs = util_make_vertex_passthrough_shader(p->pipe, 2, semantic_names, semantic_indexes, FALSE);
        }
 
        /* fragment shader */