Module: Mesa Branch: 10.1 Commit: 33169597f7e5a39ed73e3c3bf8b1aaf0bd74d258 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=33169597f7e5a39ed73e3c3bf8b1aaf0bd74d258
Author: Ilia Mirkin <[email protected]> Date: Wed Jan 29 12:36:13 2014 -0500 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]> (cherry picked from commit 356aff3a5c08be055d6befff99a72f5551b3ac2d) --- 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..e7341ef 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 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: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
