diff options
| author | Eric Anholt <eric@anholt.net> | 2009-11-18 03:39:20 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-11-19 11:47:21 +0100 |
| commit | ee64347979b4e22976910cb97869887f7de4241c (patch) | |
| tree | f8fc07c5bce72efd4e005b84a3ea575102bd6026 /src/mesa/drivers/dri/i915/i915_texstate.c | |
| parent | c4b7c47fe3135f852919cf2d4a2f64210e8cf125 (diff) | |
intel: Remove our special color packing macros and just use colormac.h.
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_texstate.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index d6689af53f..1bacd51aec 100644 --- 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/colormac.h" #include "intel_mipmap_tree.h" #include "intel_tex.h" @@ -363,15 +364,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. */ - state[I915_TEXREG_SS4] = INTEL_PACKCOLOR8888(border[0], - border[0], - border[0], - border[0]); + state[I915_TEXREG_SS4] = PACK_COLOR_8888(border[0], + border[0], + border[0], + border[0]); } 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]); } |