diff options
author | Keith Packard <keithp@keithp.com> | 2008-08-04 01:43:44 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2008-08-05 15:40:14 -0700 |
commit | 12df8f40d2fb41f5446db1b49beeb442da18bee2 (patch) | |
tree | 03c1b26bf3d7900e04a881406ae9497d370b248e /src/i830_render.c | |
parent | 4cc20b7f6e25f4be4598f8edbe0077117126b4ee (diff) |
Use dri_bo for all object allocations, including pixmaps under uxa
Diffstat (limited to 'src/i830_render.c')
-rw-r--r-- | src/i830_render.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_render.c b/src/i830_render.c index d5cab3f3..4b42ea37 100644 --- a/src/i830_render.c +++ b/src/i830_render.c @@ -313,7 +313,7 @@ i830_texture_setup(PicturePtr pPict, PixmapPtr pPix, int unit) BEGIN_BATCH(10); OUT_BATCH(_3DSTATE_LOAD_STATE_IMMEDIATE_2 | LOAD_TEXTURE_MAP(unit) | 4); - OUT_RELOC_PIXMAP(pPix, TM0S0_USE_FENCE); + OUT_RELOC_PIXMAP(pPix, I915_GEM_DOMAIN_SAMPLER, 0, TM0S0_USE_FENCE); OUT_BATCH(((pPix->drawable.height - 1) << TM0S1_HEIGHT_SHIFT) | ((pPix->drawable.width - 1) << TM0S1_WIDTH_SHIFT) | format); OUT_BATCH((pitch/4 - 1) << TM0S2_PITCH_SHIFT | TM0S2_MAP_2D); @@ -444,7 +444,7 @@ i830_prepare_composite(int op, PicturePtr pSrcPicture, OUT_BATCH(_3DSTATE_BUF_INFO_CMD); OUT_BATCH(BUF_3D_ID_COLOR_BACK| BUF_3D_USE_FENCE | BUF_3D_PITCH(dst_pitch)); - OUT_RELOC_PIXMAP(pDst, 0); + OUT_RELOC_PIXMAP(pDst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0); OUT_BATCH(MI_NOOP); OUT_BATCH(_3DSTATE_DST_BUF_VARS_CMD); |