aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2017-03-05 12:30:01 -0700
committerBrian Paul <[email protected]>2017-03-08 08:50:20 -0700
commit6614b060fb133de858a1c8291e776a9a1e7a1eab (patch)
tree8d8660843fdfbd1731214f37530f9f98abd1b861
parentf676c700cc3faa26ab90a36b7af15cbc282db069 (diff)
swr: s/unsigned/enum pipe_shader_type/
Reviewed-by: Edward O'Callaghan <[email protected]>
-rw-r--r--src/gallium/drivers/swr/swr_shader.cpp2
-rw-r--r--src/gallium/drivers/swr/swr_state.cpp4
-rw-r--r--src/gallium/drivers/swr/swr_tex_sample.cpp4
-rw-r--r--src/gallium/drivers/swr/swr_tex_sample.h3
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 09d8145a8f5..a449c58ed95 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 b3896649848..fb284d8576f 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 37ad39b950d..ec2fa154085 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 cb7e83d1c39..715ca3c3e19 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);