diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2009-12-26 15:56:58 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2009-12-28 18:05:49 +0100 |
| commit | 7c72ac1f47e19af97c997f57012e3af12f941894 (patch) | |
| tree | 06a7648a136cc0065c7169fb88f032b1bd38de98 | |
| parent | 6992d0e7a0cb3c32b16af0b724246e44f7a35d7e (diff) | |
nv10/exa: Fix for the latest nouveau_class.h changes.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
| -rw-r--r-- | src/nv10_exa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nv10_exa.c b/src/nv10_exa.c index 7b70239..a3425a8 100644 --- a/src/nv10_exa.c +++ b/src/nv10_exa.c @@ -468,18 +468,18 @@ setup_render_target(NVPtr pNv, PicturePtr pict, PixmapPtr pixmap) #define RC_IN_ONE(input) \ (NV10TCL_RC_IN_RGB_##input##_INPUT_ZERO | \ NV10TCL_RC_IN_RGB_##input##_COMPONENT_USAGE_ALPHA | \ - NV10TCL_RC_IN_RGB_##input##_MAPPING_UNSIGNED_INVERT_NV) + NV10TCL_RC_IN_RGB_##input##_MAPPING_UNSIGNED_INVERT) /* Bind the combiner variable <input> to the specified channel from * the texture unit <unit>. */ #define RC_IN_TEX(input, chan, unit) \ - (NV10TCL_RC_IN_RGB_##input##_INPUT_TEXTURE##unit##_ARB | \ + (NV10TCL_RC_IN_RGB_##input##_INPUT_TEXTURE##unit | \ NV10TCL_RC_IN_RGB_##input##_COMPONENT_USAGE_##chan) /* Bind the combiner variable <input> to the specified channel from * the constant color <unit>. */ #define RC_IN_COLOR(input, chan, unit) \ - (NV10TCL_RC_IN_RGB_##input##_INPUT_CONSTANT_COLOR##unit##_NV | \ + (NV10TCL_RC_IN_RGB_##input##_INPUT_CONSTANT_COLOR##unit | \ NV10TCL_RC_IN_RGB_##input##_COMPONENT_USAGE_##chan) static void |