diff options
| author | Vladimir Dergachev <[email protected]> | 2005-01-13 23:13:52 +0000 |
|---|---|---|
| committer | Vladimir Dergachev <[email protected]> | 2005-01-13 23:13:52 +0000 |
| commit | d2001bd88ff10b191fa13a84b8d8a77352616fa6 (patch) | |
| tree | 9ee030d190925e8a510dedec3f407d7ed15b2928 | |
| parent | f11d6d4cb4792f4fb358da3c97a66bcf2fd49cea (diff) | |
Sync with master copy.
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_reg.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h index 5650e488c62..f728190a583 100644 --- a/src/mesa/drivers/dri/r300/r300_reg.h +++ b/src/mesa/drivers/dri/r300/r300_reg.h @@ -640,14 +640,14 @@ I am fairly certain that they are correct unless stated otherwise in comments. # define R300_TX_FORMAT_ZERO 4 # define R300_TX_FORMAT_ONE 5 -# define R300_TX_FORMAT_R_SHIFT 18 +# define R300_TX_FORMAT_B_SHIFT 18 # define R300_TX_FORMAT_G_SHIFT 15 -# define R300_TX_FORMAT_B_SHIFT 12 +# define R300_TX_FORMAT_R_SHIFT 12 # define R300_TX_FORMAT_A_SHIFT 9 -# define R300_EASY_TX_FORMAT(R, G, B, A, FMT) (\ - ((R300_TX_FORMAT_##R)<<R300_TX_FORMAT_R_SHIFT) \ +# define R300_EASY_TX_FORMAT(B, G, R, A, FMT) (\ + ((R300_TX_FORMAT_##B)<<R300_TX_FORMAT_B_SHIFT) \ | ((R300_TX_FORMAT_##G)<<R300_TX_FORMAT_G_SHIFT) \ - | ((R300_TX_FORMAT_##B)<<R300_TX_FORMAT_B_SHIFT) \ + | ((R300_TX_FORMAT_##R)<<R300_TX_FORMAT_R_SHIFT) \ | ((R300_TX_FORMAT_##A)<<R300_TX_FORMAT_A_SHIFT) \ | (R300_TX_FORMAT_##FMT) \ ) |