diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-07-24 20:32:08 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2014-07-28 23:57:08 +0200 |
| commit | 04f2c88f45e26d7050cc88aaaac8e8154d6018d0 (patch) | |
| tree | f2c3713a675d01a3a44f90c01b69d44aecfdb7b5 /src/gallium/drivers/r300/r300_screen.c | |
| parent | d5bcb5e8dea3dc949ff6b093af7f46585b94b63e (diff) | |
| download | external_mesa3d-04f2c88f45e26d7050cc88aaaac8e8154d6018d0.zip external_mesa3d-04f2c88f45e26d7050cc88aaaac8e8154d6018d0.tar.gz external_mesa3d-04f2c88f45e26d7050cc88aaaac8e8154d6018d0.tar.bz2 | |
gallium: rename shader cap MAX_CONSTS to MAX_CONST_BUFFER_SIZE
This new name isn't so confusing.
I also changed the gallivm limit, because it looked wrong.
Reviewed-by: Brian Paul <brianp@vmware.com>
v2: use sizeof(float[4])
Diffstat (limited to 'src/gallium/drivers/r300/r300_screen.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index efa69d3..a2ac26a 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -241,8 +241,8 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e * additional texcoords but there is no two-sided color * selection then. However the facing bit can be used instead. */ return 10; - case PIPE_SHADER_CAP_MAX_CONSTS: - return is_r500 ? 256 : 32; + case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE: + return (is_r500 ? 256 : 32) * sizeof(float[4]); case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: return 1; case PIPE_SHADER_CAP_MAX_TEMPS: @@ -289,8 +289,8 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e return is_r500 ? 4 : 0; /* For loops; not sure about conditionals. */ case PIPE_SHADER_CAP_MAX_INPUTS: return 16; - case PIPE_SHADER_CAP_MAX_CONSTS: - return 256; + case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE: + return 256 * sizeof(float[4]); case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: return 1; case PIPE_SHADER_CAP_MAX_TEMPS: |