From: Marek Olšák <marek.ol...@amd.com>
---
src/gallium/drivers/ilo/core/ilo_state_3d.h | 2 +-
src/gallium/include/pipe/p_state.h | 3 ++-
src/gallium/state_trackers/clover/core/device.cpp | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/ilo/core/ilo_state_3d.h
b/src/gallium/drivers/ilo/core/ilo_state_3d.h
index fdce445..d41edc1 100644
--- a/src/gallium/drivers/ilo/core/ilo_state_3d.h
+++ b/src/gallium/drivers/ilo/core/ilo_state_3d.h
@@ -250,7 +250,7 @@ struct ilo_cbuf_state {
};
struct ilo_resource_state {
- struct pipe_surface *states[PIPE_MAX_SHADER_RESOURCES];
+ struct pipe_surface *states[PIPE_MAX_SHADER_IMAGES];
unsigned count;
};
diff --git a/src/gallium/include/pipe/p_state.h
b/src/gallium/include/pipe/p_state.h
index e01c62c..dc8f550 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -61,7 +61,8 @@ extern "C" {
#define PIPE_MAX_SHADER_INPUTS 80 /* 32 GENERIC + 32 PATCH + 16 others */
#define PIPE_MAX_SHADER_OUTPUTS 80 /* 32 GENERIC + 32 PATCH + 16 others */
#define PIPE_MAX_SHADER_SAMPLER_VIEWS 32
-#define PIPE_MAX_SHADER_RESOURCES 32
+#define PIPE_MAX_SHADER_BUFFERS 32
+#define PIPE_MAX_SHADER_IMAGES 32
#define PIPE_MAX_TEXTURE_LEVELS 16
#define PIPE_MAX_SO_BUFFERS 4
#define PIPE_MAX_SO_OUTPUTS 64
diff --git a/src/gallium/state_trackers/clover/core/device.cpp
b/src/gallium/state_trackers/clover/core/device.cpp
index 42b45b7..50d4d04 100644
--- a/src/gallium/state_trackers/clover/core/device.cpp
+++ b/src/gallium/state_trackers/clover/core/device.cpp
@@ -89,12 +89,12 @@ device::vendor_id() const {
size_t
device::max_images_read() const {
- return PIPE_MAX_SHADER_RESOURCES;
+ return PIPE_MAX_SHADER_IMAGES;
}
size_t
device::max_images_write() const {
- return PIPE_MAX_SHADER_RESOURCES;
+ return PIPE_MAX_SHADER_IMAGES;
}
cl_uint
--
2.1.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
