diff options
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_context.c | 10 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_context.h | 10 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.c | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_llvm.h | 5 |
4 files changed, 15 insertions, 14 deletions
diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c index 46dd0b4128f..8f1189a6bda 100644 --- a/src/gallium/auxiliary/draw/draw_context.c +++ b/src/gallium/auxiliary/draw/draw_context.c @@ -440,7 +440,7 @@ draw_set_mapped_vertex_buffer(struct draw_context *draw, void draw_set_mapped_constant_buffer(struct draw_context *draw, - unsigned shader_type, + enum pipe_shader_type shader_type, unsigned slot, const void *buffer, unsigned size ) @@ -720,7 +720,7 @@ draw_total_gs_outputs(const struct draw_context *draw) */ void draw_texture_sampler(struct draw_context *draw, - uint shader, + enum pipe_shader_type shader, struct tgsi_sampler *sampler) { if (shader == PIPE_SHADER_VERTEX) { @@ -738,7 +738,7 @@ draw_texture_sampler(struct draw_context *draw, */ void draw_image(struct draw_context *draw, - uint shader, + enum pipe_shader_type shader, struct tgsi_image *image) { if (shader == PIPE_SHADER_VERTEX) { @@ -756,7 +756,7 @@ draw_image(struct draw_context *draw, */ void draw_buffer(struct draw_context *draw, - uint shader, + enum pipe_shader_type shader, struct tgsi_buffer *buffer) { if (shader == PIPE_SHADER_VERTEX) { @@ -1011,7 +1011,7 @@ draw_set_samplers(struct draw_context *draw, void draw_set_mapped_texture(struct draw_context *draw, - unsigned shader_stage, + enum pipe_shader_type shader_stage, unsigned sview_idx, uint32_t width, uint32_t height, uint32_t depth, uint32_t first_level, uint32_t last_level, diff --git a/src/gallium/auxiliary/draw/draw_context.h b/src/gallium/auxiliary/draw/draw_context.h index e605cd6a5fb..d8a1470e901 100644 --- a/src/gallium/auxiliary/draw/draw_context.h +++ b/src/gallium/auxiliary/draw/draw_context.h @@ -152,17 +152,17 @@ draw_total_gs_outputs(const struct draw_context *draw); void draw_texture_sampler(struct draw_context *draw, - uint shader_type, + enum pipe_shader_type shader_type, struct tgsi_sampler *sampler); void draw_image(struct draw_context *draw, - uint shader_type, + enum pipe_shader_type shader_type, struct tgsi_image *image); void draw_buffer(struct draw_context *draw, - uint shader_type, + enum pipe_shader_type shader_type, struct tgsi_buffer *buffer); void @@ -178,7 +178,7 @@ draw_set_samplers(struct draw_context *draw, void draw_set_mapped_texture(struct draw_context *draw, - unsigned shader_stage, + enum pipe_shader_type shader_stage, unsigned sview_idx, uint32_t width, uint32_t height, uint32_t depth, uint32_t first_level, uint32_t last_level, @@ -249,7 +249,7 @@ void draw_set_mapped_vertex_buffer(struct draw_context *draw, void draw_set_mapped_constant_buffer(struct draw_context *draw, - unsigned shader_type, + enum pipe_shader_type shader_type, unsigned slot, const void *buffer, unsigned size); diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c index 8952dc8d3ba..104965bfeb8 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.c +++ b/src/gallium/auxiliary/draw/draw_llvm.c @@ -2068,7 +2068,7 @@ draw_llvm_dump_variant_key(struct draw_llvm_variant_key *key) void draw_llvm_set_mapped_texture(struct draw_context *draw, - unsigned shader_stage, + enum pipe_shader_type shader_stage, unsigned sview_idx, uint32_t width, uint32_t height, uint32_t depth, uint32_t first_level, uint32_t last_level, @@ -2113,7 +2113,7 @@ draw_llvm_set_mapped_texture(struct draw_context *draw, void draw_llvm_set_sampler_state(struct draw_context *draw, - unsigned shader_type) + enum pipe_shader_type shader_type) { unsigned i; diff --git a/src/gallium/auxiliary/draw/draw_llvm.h b/src/gallium/auxiliary/draw/draw_llvm.h index 2ddf249672e..57c9e72c04c 100644 --- a/src/gallium/auxiliary/draw/draw_llvm.h +++ b/src/gallium/auxiliary/draw/draw_llvm.h @@ -508,11 +508,12 @@ struct lp_build_sampler_soa * draw_llvm_sampler_soa_create(const struct draw_sampler_static_state *static_state); void -draw_llvm_set_sampler_state(struct draw_context *draw, unsigned shader_stage); +draw_llvm_set_sampler_state(struct draw_context *draw, + enum pipe_shader_type shader_stage); void draw_llvm_set_mapped_texture(struct draw_context *draw, - unsigned shader_stage, + enum pipe_shader_type shader_stage, unsigned sview_idx, uint32_t width, uint32_t height, uint32_t depth, uint32_t first_level, uint32_t last_level, |