diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-07-05 14:34:13 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-07-16 16:52:17 +0200 |
| commit | b73bec0ecd43861337daf9663e242d2b44f36dbd (patch) | |
| tree | 4d618eef5e8fdc446b590541d15c8cd712a5631a | |
| parent | f9f79d29ce75c681c46bdbac5aa3f19ee1adb93b (diff) | |
gallium: add new limits for shader buffers and images
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
| -rw-r--r-- | src/gallium/drivers/ilo/ilo_state.h | 2 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_state.h | 3 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/core/device.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/ilo/ilo_state.h b/src/gallium/drivers/ilo/ilo_state.h index 3e6fd8a2554..66c93007eb1 100644 --- a/src/gallium/drivers/ilo/ilo_state.h +++ b/src/gallium/drivers/ilo/ilo_state.h @@ -202,7 +202,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 a18f12e8a87..1c529f7d078 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 c42d1d26004..6efff79c7f4 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 |