diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-03-10 09:27:36 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2012-04-24 10:45:08 -0400 |
| commit | ed637428b3b3c888a51b58fc589bb0692dad3b6a (patch) | |
| tree | 83a1f67439002879df438915b36e0ced255165fb | |
| parent | ae59ca6ff5e6d9149cdafb02cfa38ce4629f7eff (diff) | |
uxa: Remove unused tracking of the current render target
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 9c6f79440e8af9f264e3f6270384064dc1f44721)
| -rw-r--r-- | src/i915_render.c | 5 | ||||
| -rw-r--r-- | src/intel.h | 1 | ||||
| -rw-r--r-- | src/intel_uxa.c | 7 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/i915_render.c b/src/i915_render.c index 7a564387..32c56843 100644 --- a/src/i915_render.c +++ b/src/i915_render.c @@ -1016,7 +1016,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) * XXX However for reasons unfathomed, correct rendering in KDE requires * at least a MI_FLUSH | INHIBIT_RENDER_CACHE_FLUSH here. */ - if (1 || dest != intel->render_current_dest) { + if (1) { uint32_t tiling_bits; if (intel_pixmap_tiled(dest)) { @@ -1044,8 +1044,6 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) DRAW_XMAX(dest->drawable.width - 1)); /* yorig, xorig (relate to color buffer?) */ OUT_BATCH(0x00000000); - - intel->render_current_dest = dest; } { @@ -1174,6 +1172,5 @@ void i915_batch_commit_notify(intel_screen_private *intel) { intel->needs_render_state_emit = TRUE; - intel->render_current_dest = NULL; intel->last_floats_per_vertex = 0; } diff --git a/src/intel.h b/src/intel.h index ef00a01d..b7793ee7 100644 --- a/src/intel.h +++ b/src/intel.h @@ -269,7 +269,6 @@ typedef struct intel_screen_private { PicturePtr render_source_picture, render_mask_picture, render_dest_picture; CARD32 render_source_solid; CARD32 render_mask_solid; - PixmapPtr render_current_dest; Bool render_source_is_solid; Bool render_mask_is_solid; Bool needs_3d_invariant; diff --git a/src/intel_uxa.c b/src/intel_uxa.c index c0e11834..446befd5 100644 --- a/src/intel_uxa.c +++ b/src/intel_uxa.c @@ -628,12 +628,9 @@ dri_bo *intel_get_pixmap_bo(PixmapPtr pixmap) void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo) { - ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum]; - intel_screen_private *intel = intel_get_screen_private(scrn); struct intel_pixmap *priv; priv = intel_get_pixmap_private(pixmap); - if (priv == NULL && bo == NULL) return; @@ -643,9 +640,6 @@ void intel_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo) dri_bo_unreference(priv->bo); list_del(&priv->batch); - - if (intel->render_current_dest == pixmap) - intel->render_current_dest = NULL; } if (bo != NULL) { @@ -1261,7 +1255,6 @@ Bool intel_uxa_init(ScreenPtr screen) intel->uxa_driver->uxa_major = 1; intel->uxa_driver->uxa_minor = 0; - intel->render_current_dest = NULL; intel->prim_offset = 0; intel->vertex_count = 0; intel->vertex_offset = 0; |