[Mesa-dev] [PATCH 08/14] swr: s/unsigned/enum pipe_shader_type/

[Brian Paul]

---
 src/gallium/drivers/swr/swr_shader.cpp     | 2 +-
 src/gallium/drivers/swr/swr_state.cpp      | 4 ++--
 src/gallium/drivers/swr/swr_tex_sample.cpp | 4 ++--
 src/gallium/drivers/swr/swr_tex_sample.h   | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/swr/swr_shader.cpp b/src/gallium/drivers/swr/swr_shader.cpp
index 09d8145..a449c58 100644
--- a/src/gallium/drivers/swr/swr_shader.cpp
+++ b/src/gallium/drivers/swr/swr_shader.cpp
@@ -76,7 +76,7 @@ bool operator==(const swr_jit_gs_key &lhs, const swr_jit_gs_key &rhs)
 static void
 swr_generate_sampler_key(const struct lp_tgsi_info &info,
                          struct swr_context *ctx,
-                         unsigned shader_type,
+                         enum pipe_shader_type shader_type,
                          struct swr_jit_sampler_key &key)
 {
    key.nr_samplers = info.base.file_max[TGSI_FILE_SAMPLER] + 1;
diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp
index b389664..fb284d8 100644
--- a/src/gallium/drivers/swr/swr_state.cpp
+++ b/src/gallium/drivers/swr/swr_state.cpp
@@ -748,7 +748,7 @@ swr_update_resource_status(struct pipe_context *pipe,
 
 static void
 swr_update_texture_state(struct swr_context *ctx,
-                         unsigned shader_type,
+                         enum pipe_shader_type shader_type,
                          unsigned num_sampler_views,
                          swr_jit_texture *textures)
 {
@@ -802,7 +802,7 @@ swr_update_texture_state(struct swr_context *ctx,
 
 static void
 swr_update_sampler_state(struct swr_context *ctx,
-                         unsigned shader_type,
+                         enum pipe_shader_type shader_type,
                          unsigned num_samplers,
                          swr_jit_sampler *samplers)
 {
diff --git a/src/gallium/drivers/swr/swr_tex_sample.cpp b/src/gallium/drivers/swr/swr_tex_sample.cpp
index 37ad39b..ec2fa15 100644
--- a/src/gallium/drivers/swr/swr_tex_sample.cpp
+++ b/src/gallium/drivers/swr/swr_tex_sample.cpp
@@ -74,7 +74,7 @@ struct swr_sampler_dynamic_state {
 
    const struct swr_sampler_static_state *static_state;
 
-   unsigned shader_type;
+   enum pipe_shader_type shader_type;
 };
 
 
@@ -325,7 +325,7 @@ swr_sampler_soa_emit_size_query(const struct lp_build_sampler_soa *base,
 
 struct lp_build_sampler_soa *
 swr_sampler_soa_create(const struct swr_sampler_static_state *static_state,
-                       unsigned shader_type)
+                       enum pipe_shader_type shader_type)
 {
    struct swr_sampler_soa *sampler;
 
diff --git a/src/gallium/drivers/swr/swr_tex_sample.h b/src/gallium/drivers/swr/swr_tex_sample.h
index cb7e83d..715ca3c 100644
--- a/src/gallium/drivers/swr/swr_tex_sample.h
+++ b/src/gallium/drivers/swr/swr_tex_sample.h
@@ -44,4 +44,5 @@ struct swr_sampler_static_state {
  *
  */
 struct lp_build_sampler_soa *
-swr_sampler_soa_create(const struct swr_sampler_static_state *key, unsigned shader_type);
+swr_sampler_soa_create(const struct swr_sampler_static_state *key,
+                       enum pipe_shader_type shader_type);
-- 
1.9.1