projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r600: add DDX DDY opcodes
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i915
/
i915_texstate.c
diff --git
a/src/mesa/drivers/dri/i915/i915_texstate.c
b/src/mesa/drivers/dri/i915/i915_texstate.c
index f52ff2bcc4ab61ee3a611726f59c13d24e0f55f0..2b03331a004642e16cba1482b956e73749f4fdec 100644
(file)
--- a/
src/mesa/drivers/dri/i915/i915_texstate.c
+++ b/
src/mesa/drivers/dri/i915/i915_texstate.c
@@
-28,6
+28,7
@@
#include "main/mtypes.h"
#include "main/enums.h"
#include "main/macros.h"
#include "main/mtypes.h"
#include "main/enums.h"
#include "main/macros.h"
+#include "main/colormac.h"
#include "intel_mipmap_tree.h"
#include "intel_tex.h"
#include "intel_mipmap_tree.h"
#include "intel_tex.h"
@@
-360,15
+361,15
@@
i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
* R channel, while the hardware uses A. Spam R into all the channels
* for safety.
*/
* R channel, while the hardware uses A. Spam R into all the channels
* for safety.
*/
- state[I915_TEXREG_SS4] =
INTEL_PACKCOLOR
8888(border[0],
-
border[0],
-
border[0],
-
border[0]);
+ state[I915_TEXREG_SS4] =
PACK_COLOR_
8888(border[0],
+ border[0],
+ border[0],
+ border[0]);
} else {
} else {
- state[I915_TEXREG_SS4] =
INTEL_PACKCOLOR8888(border[0
],
-
border[1
],
-
border[2
],
-
border[3
]);
+ state[I915_TEXREG_SS4] =
PACK_COLOR_8888(border[3
],
+
border[0
],
+
border[1
],
+
border[2
]);
}
}