diff options
| -rw-r--r-- | src/i915_3d.c | 4 | ||||
| -rw-r--r-- | src/i915_exa_render.c | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/i915_3d.c b/src/i915_3d.c index d8edb181..942dbd17 100644 --- a/src/i915_3d.c +++ b/src/i915_3d.c @@ -77,9 +77,7 @@ void I915EmitInvarientState( ScrnInfoPtr pScrn ) /* Need to initialize this to zero. */ - OUT_RING(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | - I1_LOAD_S(3) | - (1)); + OUT_RING(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(3) | 0); OUT_RING(0); /* XXX: Use this */ diff --git a/src/i915_exa_render.c b/src/i915_exa_render.c index 4249869d..181fb89b 100644 --- a/src/i915_exa_render.c +++ b/src/i915_exa_render.c @@ -268,7 +268,7 @@ I915TextureSetup(PicturePtr pPict, PixmapPtr pPix, int unit) format |= MAPSURF_32BIT; BEGIN_LP_RING(6); - OUT_RING(_3DSTATE_MAP_STATE | (3 * (1 << unit))); + OUT_RING(_3DSTATE_MAP_STATE | 3); OUT_RING(1<<unit); OUT_RING(offset&MS2_ADDRESS_MASK); ms3 = (pPix->drawable.height << MS3_HEIGHT_SHIFT) | @@ -286,7 +286,7 @@ I915TextureSetup(PicturePtr pPict, PixmapPtr pPix, int unit) BEGIN_LP_RING(6); /* max & min mip level ? or base mip level? */ - OUT_RING(_3DSTATE_SAMPLER_STATE | (3*(1<<unit))); + OUT_RING(_3DSTATE_SAMPLER_STATE | 3); OUT_RING(1<<unit); ss2 = (MIPFILTER_NONE << SS2_MIP_FILTER_SHIFT); ss2 |= filter; @@ -390,8 +390,8 @@ ErrorF("i915 prepareComposite\n"); OUT_RING(0); /* XXX:S3? define vertex format with tex coord sets number*/ - OUT_RING(_3DSTATE_LOAD_STATE_IMMEDIATE_1|I1_LOAD_S(2)|I1_LOAD_S(3)| - I1_LOAD_S(4)|3); + OUT_RING(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(2) | + I1_LOAD_S(3) | I1_LOAD_S(4) | 2); ss2 = S2_TEXCOORD_FMT(0, TEXCOORDFMT_2D); if (pMask) ss2 |= S2_TEXCOORD_FMT(1, TEXCOORDFMT_2D); @@ -467,7 +467,7 @@ ErrorF("i915 prepareComposite\n"); blendctl = I915GetBlendCntl(op, pMaskPicture, pDstPicture->format); BEGIN_LP_RING(2); - OUT_RING(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(6) | 1); + OUT_RING(_3DSTATE_LOAD_STATE_IMMEDIATE_1 | I1_LOAD_S(6) | 0); ss6 = S6_CBUF_BLEND_ENABLE | S6_COLOR_WRITE_ENABLE; OUT_RING(ss6 | (0 << S6_CBUF_BLEND_FUNC_SHIFT) | blendctl); ADVANCE_LP_RING(); |