[Mesa-dev] [PATCH 4/4] gallium: Use enum pipe_shader_type in set_shader_images()
Kai Wasserbäch
kai at dev.carbon-project.org
Sat Aug 27 10:08:26 UTC 2016
Signed-off-by: Kai Wasserbäch <kai at dev.carbon-project.org>
---
src/gallium/auxiliary/cso_cache/cso_context.c | 3 ++-
src/gallium/auxiliary/cso_cache/cso_context.h | 3 ++-
src/gallium/drivers/ddebug/dd_context.c | 3 ++-
src/gallium/drivers/ilo/ilo_state.c | 2 +-
src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 3 ++-
src/gallium/drivers/radeonsi/si_descriptors.c | 3 ++-
src/gallium/drivers/softpipe/sp_state_image.c | 2 +-
src/gallium/drivers/trace/tr_context.c | 2 +-
src/gallium/include/pipe/p_context.h | 3 ++-
src/mesa/state_tracker/st_atom_image.c | 2 +-
10 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 5e6b36e..127e071 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -1360,7 +1360,8 @@ cso_restore_fragment_sampler_views(struct cso_context *ctx)
void
-cso_set_shader_images(struct cso_context *ctx, unsigned shader_stage,
+cso_set_shader_images(struct cso_context *ctx,
+ enum pipe_shader_type shader_stage,
unsigned start, unsigned count,
struct pipe_image_view *images)
{
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.h b/src/gallium/auxiliary/cso_cache/cso_context.h
index 27863f4..29e5e33 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.h
+++ b/src/gallium/auxiliary/cso_cache/cso_context.h
@@ -196,7 +196,8 @@ cso_set_sampler_views(struct cso_context *cso,
/* shader images */
void
-cso_set_shader_images(struct cso_context *cso, unsigned shader_stage,
+cso_set_shader_images(struct cso_context *cso,
+ enum pipe_shader_type shader_stage,
unsigned start, unsigned count,
struct pipe_image_view *views);
diff --git a/src/gallium/drivers/ddebug/dd_context.c b/src/gallium/drivers/ddebug/dd_context.c
index 50edfd7..4bcbbff 100644
--- a/src/gallium/drivers/ddebug/dd_context.c
+++ b/src/gallium/drivers/ddebug/dd_context.c
@@ -521,7 +521,8 @@ dd_context_set_sampler_views(struct pipe_context *_pipe,
}
static void
-dd_context_set_shader_images(struct pipe_context *_pipe, unsigned shader,
+dd_context_set_shader_images(struct pipe_context *_pipe,
+ enum pipe_shader_type shader,
unsigned start, unsigned num,
const struct pipe_image_view *views)
{
diff --git a/src/gallium/drivers/ilo/ilo_state.c b/src/gallium/drivers/ilo/ilo_state.c
index 0ae32c7..95b292a 100644
--- a/src/gallium/drivers/ilo/ilo_state.c
+++ b/src/gallium/drivers/ilo/ilo_state.c
@@ -1853,7 +1853,7 @@ ilo_set_sampler_views(struct pipe_context *pipe, enum pipe_shader_type shader,
}
static void
-ilo_set_shader_images(struct pipe_context *pipe, unsigned shader,
+ilo_set_shader_images(struct pipe_context *pipe, enum pipe_shader_type shader,
unsigned start, unsigned count,
const struct pipe_image_view *views)
{
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
index ee1e184..6aaada4 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state.c
@@ -1344,7 +1344,8 @@ nvc0_bind_images_range(struct nvc0_context *nvc0, const unsigned s,
}
static void
-nvc0_set_shader_images(struct pipe_context *pipe, unsigned shader,
+nvc0_set_shader_images(struct pipe_context *pipe,
+ enum pipe_shader_type shader,
unsigned start, unsigned nr,
const struct pipe_image_view *images)
{
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
index dfd0607..eb0e5fa 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -704,7 +704,8 @@ static void si_set_shader_image(struct si_context *ctx,
}
static void
-si_set_shader_images(struct pipe_context *pipe, unsigned shader,
+si_set_shader_images(struct pipe_context *pipe,
+ enum pipe_shader_type shader,
unsigned start_slot, unsigned count,
const struct pipe_image_view *views)
{
diff --git a/src/gallium/drivers/softpipe/sp_state_image.c b/src/gallium/drivers/softpipe/sp_state_image.c
index c5ef466..38e5cd4 100644
--- a/src/gallium/drivers/softpipe/sp_state_image.c
+++ b/src/gallium/drivers/softpipe/sp_state_image.c
@@ -27,7 +27,7 @@
#include "sp_buffer.h"
static void softpipe_set_shader_images(struct pipe_context *pipe,
- unsigned shader,
+ enum pipe_shader_type shader,
unsigned start,
unsigned num,
const struct pipe_image_view *images)
diff --git a/src/gallium/drivers/trace/tr_context.c b/src/gallium/drivers/trace/tr_context.c
index 61b69c2..e833fb2 100644
--- a/src/gallium/drivers/trace/tr_context.c
+++ b/src/gallium/drivers/trace/tr_context.c
@@ -1749,7 +1749,7 @@ static void trace_context_set_shader_buffers(struct pipe_context *_context,
}
static void trace_context_set_shader_images(struct pipe_context *_context,
- unsigned shader,
+ enum pipe_shader_type shader,
unsigned start, unsigned nr,
const struct pipe_image_view *images)
{
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index bea1924..f5841d7 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -332,7 +332,8 @@ struct pipe_context {
* unless it's NULL, in which case no images will
* be bound.
*/
- void (*set_shader_images)(struct pipe_context *, unsigned shader,
+ void (*set_shader_images)(struct pipe_context *,
+ enum pipe_shader_type shader,
unsigned start_slot, unsigned count,
const struct pipe_image_view *images);
diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c
index 4d76ac9..a7b7371 100644
--- a/src/mesa/state_tracker/st_atom_image.c
+++ b/src/mesa/state_tracker/st_atom_image.c
@@ -46,7 +46,7 @@
static void
st_bind_images(struct st_context *st, struct gl_linked_shader *shader,
- unsigned shader_type)
+ enum pipe_shader_type shader_type)
{
unsigned i;
struct pipe_image_view images[MAX_IMAGE_UNIFORMS];
--
2.9.3
More information about the mesa-dev
mailing list