diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-01 16:18:21 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-01 16:18:21 +0300 |
| commit | 7de350c673e1c0ae52d655e322a072f2f6b624b0 (patch) | |
| tree | 346005084450b679f57c77daad2263fcdcf9e1de /drivers/3dfx.h | |
| parent | 28fbfd2cdea5ffa860a251de274a74b0e85c88f0 (diff) | |
| parent | 3ff9a6e7d82ff9a5231e561bd2686fab7df97f68 (diff) | |
| download | mpv-7de350c673e1c0ae52d655e322a072f2f6b624b0.tar.bz2 mpv-7de350c673e1c0ae52d655e322a072f2f6b624b0.tar.xz | |
Merge svn changes up to r27184
Diffstat (limited to 'drivers/3dfx.h')
| -rw-r--r-- | drivers/3dfx.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/3dfx.h b/drivers/3dfx.h index 2649804006..99d6ef0a75 100644 --- a/drivers/3dfx.h +++ b/drivers/3dfx.h @@ -259,10 +259,10 @@ typedef struct voodoo_yuv_fb_t voodoo_yuv_fb; #define BIT(x) (1UL << (x)) /* COMMAND_2D reg. values */ -#define ROP_COPY 0xcc // src -#define ROP_INVERT 0x55 // NOT dst -#define ROP_XOR 0x66 // src XOR dst -#define ROP_OR (0xee) /* src | dst */ +#define TDFXFB_ROP_COPY 0xcc // src +#define TDFXFB_ROP_INVERT 0x55 // NOT dst +#define TDFXFB_ROP_XOR 0x66 // src XOR dst +#define TDFXFB_ROP_OR 0xee // src | dst #define AUTOINC_DSTX BIT(10) #define AUTOINC_DSTY BIT(11) |