diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-01-29 12:36:13 -0500 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-03-04 13:10:35 -0800 |
| commit | d141825eff4addb69a605e76a5c758ab3d8ce055 (patch) | |
| tree | 1603e67a103b3f5dfc89014cd0cbe0e33ecb4ca7 | |
| parent | d13adcae22bf624bd34b28a212b107746f64141c (diff) | |
| download | mesa-d141825eff4addb69a605e76a5c758ab3d8ce055.tar.gz | |
nv30: report 8 maximum inputs
nvfx_fragprog_assign_generic only allows for up to 10/8 texcoords for
nv40/nv30. This fixes compilation of the varying-packing tests.
Furthermore it appears that the last 2 inputs on nv4x don't seem to
work in those tests, so just report 8 everywhere for now.
Tested on NV42, NV44. NV4B appears to have additional problems.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: 9.1 9.2 10.0 10.1 <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 356aff3a5c08be055d6befff99a72f5551b3ac2d)
| -rw-r--r-- | src/gallium/drivers/nouveau/nv30/nv30_screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c b/src/gallium/drivers/nouveau/nv30/nv30_screen.c index 807100ee0d0..e861605e536 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -218,7 +218,7 @@ nv30_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader, case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH: return 0; case PIPE_SHADER_CAP_MAX_INPUTS: - return (eng3d->oclass >= NV40_3D_CLASS) ? 12 : 10; + return 8; /* should be possible to do 10 with nv4x */ case PIPE_SHADER_CAP_MAX_CONSTS: return (eng3d->oclass >= NV40_3D_CLASS) ? 224 : 32; case PIPE_SHADER_CAP_MAX_CONST_BUFFERS: |