diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2014-10-01 20:28:17 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2014-10-21 21:59:02 +0200 |
| commit | 5f5b83cbba95a7bb8955b09e24df1e9487c10734 (patch) | |
| tree | 8c7d60661400833a268e2c87857a6152910f6218 /src/gallium/drivers/r300/r300_screen.c | |
| parent | ef280c95f2623357452f5ca8e65367b7ac30699f (diff) | |
| download | external_mesa3d-5f5b83cbba95a7bb8955b09e24df1e9487c10734.zip external_mesa3d-5f5b83cbba95a7bb8955b09e24df1e9487c10734.tar.gz external_mesa3d-5f5b83cbba95a7bb8955b09e24df1e9487c10734.tar.bz2 | |
gallium: add PIPE_SHADER_CAP_MAX_OUTPUTS and use it in st/mesa
With 5 shader stages and various combinations of enabled and disabled shaders,
the maximum number of outputs in one shader doesn't have to be equal to
the maximum number of inputs in the following shader.
v2: return 32 for softpipe and llvmpipe
Diffstat (limited to 'src/gallium/drivers/r300/r300_screen.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index c35559f..db9ad15 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -258,6 +258,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_OUTPUTS: + return 4; case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE: return (is_r500 ? 256 : 32) * sizeof(float[4]); case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: @@ -306,6 +308,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_OUTPUTS: + return 10; case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE: return 256 * sizeof(float[4]); case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: |