diff options
| author | Luca Barbieri <[email protected]> | 2010-02-21 02:26:25 +0100 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2010-03-15 00:03:02 -0400 |
| commit | d9e396ce4a124529fa92ad967f2b3ff72534079b (patch) | |
| tree | 4e5602992044650eb47450c9e3b296b377cb336b /src/gallium/drivers/nv40/nv40_draw.c | |
| parent | cd0d03adab65a9586e0c5d60e9ee487677914f3b (diff) | |
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.
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_draw.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c index 87d2689d54b..4ed87779fd6 100644 --- a/src/gallium/drivers/nv40/nv40_draw.c +++ b/src/gallium/drivers/nv40/nv40_draw.c @@ -8,7 +8,7 @@ #include "draw/draw_pipe.h" #include "nv40_context.h" -#define NV40_SHADER_NO_FUCKEDNESS +#define NVFX_SHADER_NO_FUCKEDNESS #include "nv40_shader.h" /* Simple, but crappy, swtnl path, hopefully we wont need to hit this very |