nv30, nv40: non-trivially partially unify nv[34]0_shader.h
authorLuca Barbieri <luca@luca-barbieri.com>
Sun, 21 Feb 2010 01:26:25 +0000 (02:26 +0100)
committerYounes Manton <younes.m@gmail.com>
Mon, 15 Mar 2010 04:03:02 +0000 (00:03 -0400)
commitd9e396ce4a124529fa92ad967f2b3ff72534079b
tree4e5602992044650eb47450c9e3b296b377cb336b
parentcd0d03adab65a9586e0c5d60e9ee487677914f3b
nv30, nv40: non-trivially partially unify nv[34]0_shader.h

shader.h is similar, except for the following differences:
1. The instruction sets are not exactly the same, but mostly similar
2. Vertex program fields are in different bit positions

This patch unifies all parts of nv[34]0_shader.h except the vertex
program fields.

Vertex opcodes are also changed so that the constant names includes
SCA if it is a scalar opcode and VEC if it is a vector opcode.
src/gallium/drivers/nv30/nv30_fragprog.c
src/gallium/drivers/nv30/nv30_shader.h
src/gallium/drivers/nv30/nv30_vertprog.c
src/gallium/drivers/nv40/nv40_draw.c
src/gallium/drivers/nv40/nv40_fragprog.c
src/gallium/drivers/nv40/nv40_shader.h
src/gallium/drivers/nv40/nv40_vertprog.c
src/gallium/drivers/nvfx/nvfx_shader.h [new file with mode: 0644]