diff options
| author | Viktor Novotný <[email protected]> | 2010-11-01 01:26:04 +0100 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2010-11-15 17:42:06 +0100 |
| commit | 8983855012301c8ebc023edf42ddf5e423189585 (patch) | |
| tree | 681aabe3787c9bfdf082fdd586be6ddf47da2eca /src/mesa/drivers/dri/nouveau/nv04_state_frag.c | |
| parent | dfc2bf818b38d7b3449d1ff5729873d77b4ff10f (diff) | |
dri/nouveau: nv04: Use rules-ng-ng headers
Signed-off-by: Francisco Jerez <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv04_state_frag.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv04_state_frag.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_frag.c b/src/mesa/drivers/dri/nouveau/nv04_state_frag.c index 658b23a4d91..21478de262d 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_state_frag.c +++ b/src/mesa/drivers/dri/nouveau/nv04_state_frag.c @@ -27,12 +27,13 @@ #include "nouveau_driver.h" #include "nouveau_context.h" #include "nouveau_util.h" -#include "nouveau_class.h" +#include "nv_object.xml.h" +#include "nv04_3d.xml.h" #include "nv04_driver.h" #define COMBINER_SHIFT(in) \ - (NV04_MULTITEX_TRIANGLE_COMBINE_COLOR_ARGUMENT##in##_SHIFT \ - - NV04_MULTITEX_TRIANGLE_COMBINE_COLOR_ARGUMENT0_SHIFT) + (NV04_MULTITEX_TRIANGLE_COMBINE_COLOR_ARGUMENT##in##__SHIFT \ + - NV04_MULTITEX_TRIANGLE_COMBINE_COLOR_ARGUMENT0__SHIFT) #define COMBINER_SOURCE(reg) \ NV04_MULTITEX_TRIANGLE_COMBINE_COLOR_ARGUMENT0_##reg #define COMBINER_INVERT \ |