diff options
| author | Ilia Mirkin <[email protected]> | 2014-01-29 12:36:13 -0500 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-02-08 19:06:51 -0500 |
| commit | 356aff3a5c08be055d6befff99a72f5551b3ac2d (patch) | |
| tree | 33aefc1114d535ce3414b26e3637b2509771f46d | |
| parent | 2e9ee44797fcce10e2f11ecb8520655f1e30280a (diff) | |
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 <[email protected]>
Cc: 9.1 9.2 10.0 10.1 <[email protected]>
| -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 787802d3b11..4045fdcc9d5 100644 --- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c +++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c @@ -217,7 +217,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: |