Ilia Mirkin
2014-Jan-29 17:41 UTC
[Nouveau] [PATCH] nv30: report the correct max varying limit
nvfx_fragprog_assign_generic only allows for up to 10/8 texcoords for
nv40/nv30. This fixes compilation of the varying-packing tests (although
they still fail).
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: 9.1 9.2 10.0 <mesa-stable at lists.freedesktop.org>
---
src/gallium/drivers/nouveau/nv30/nv30_screen.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
index 26ad33d..9ce10a4 100644
--- a/src/gallium/drivers/nouveau/nv30/nv30_screen.c
+++ b/src/gallium/drivers/nouveau/nv30/nv30_screen.c
@@ -219,7 +219,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 (eng3d->oclass >= NV40_3D_CLASS) ? 10 : 8;
case PIPE_SHADER_CAP_MAX_CONSTS:
return (eng3d->oclass >= NV40_3D_CLASS) ? 224 : 32;
case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
--
1.8.3.2
Apparently Analagous Threads
- [PATCH] nv50: report 15 max inputs for fragment programs
- [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords
- [PATCH 2/2] nv30/draw: switch varying hookup logic to know about texcoords
- [PATCH mesa 3/4] nv30: Do not export msaa capabable visuals on nv3x
- [PATCH 1/4] nv30: remove use_nv4x, it is identical to is_nv4x
