WebSVN – Kolibri OS – Diff – /contrib/sdk/sources/Intel-2D/sna/gen5_render.c

 #include "sna_render_inline.h"
 //#include "sna_video.h"
 #include "brw/brw.h"
+#include "gen5_render.h"
-#include "gen5_render.h"
+#include "gen4_common.h"
 #include "gen4_source.h"
 #include "gen4_vertex.h"
 static void
 gen5_align_vertex(struct sna *sna, const struct sna_composite_op *op)
+{
 	assert(op->floats_per_rect == 3*op->floats_per_vertex);
 	if (op->floats_per_vertex != sna->render_state.gen5.floats_per_vertex) {
-		if (sna->render.vertex_size - sna->render.vertex_used < 2*op->floats_per_rect)
-			gen4_vertex_finish(sna);
-		DBG(("aligning vertex: was %d, now %d floats per vertex, %d->%d\n",
+		DBG(("aligning vertex: was %d, now %d floats per vertex\n",
 		     sna->render_state.gen5.floats_per_vertex,
-		     op->floats_per_vertex,
+		     op->floats_per_vertex));
-		     sna->render.vertex_index,
+		gen4_vertex_align(sna, op);
-		     (sna->render.vertex_used + op->floats_per_vertex - 1) / op->floats_per_vertex));
-		sna->render.vertex_index = (sna->render.vertex_used + op->floats_per_vertex - 1) / op->floats_per_vertex;
-		sna->render.vertex_used = sna->render.vertex_index * op->floats_per_vertex;
 		sna->render_state.gen5.floats_per_vertex = op->floats_per_vertex;
+	}
+}
+}
 inline static void
 gen5_emit_pipe_flush(struct sna *sna)
+{
 #if 0
 	OUT_BATCH(GEN5_PIPE_CONTROL | (4 - 2));
 	OUT_BATCH(GEN5_PIPE_CONTROL_WC_FLUSH);
 	OUT_BATCH(0);
+	OUT_BATCH(0);
+#else
+	OUT_BATCH(MI_FLUSH | MI_INHIBIT_RENDER_CACHE_FLUSH);
-	OUT_BATCH(0);
+#endif
+}
 static void
 	tmp.floats_per_rect = 9;
 	tmp.priv = frame;
 	if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL)) {
 		kgem_submit(&sna->kgem);
+		if (!kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL))
-		assert(kgem_check_bo(&sna->kgem, tmp.dst.bo, frame->bo, NULL));
+			return false;
-	}
+	}
-	gen5_video_bind_surfaces(sna, &tmp);
+	gen5_align_vertex(sna, &tmp);
-	gen5_align_vertex(sna, &tmp);
+	gen5_video_bind_surfaces(sna, &tmp);
 	/* Set up the offset for translating from the given region (in screen
 		DBG(("%s: unhandled blend op %d\n", __FUNCTION__, op));
 		return false;
+	}
-	if (mask == NULL &&
-	    try_blt(sna, dst, src, width, height) &&
+	if (mask == NULL &&
 	    sna_blt_composite(sna, op,
 			      src, dst,
 			      src_x, src_y,
 			      dst_x, dst_y,
 		if (!kgem_check_bo(&sna->kgem,
 				   tmp->dst.bo, tmp->src.bo, tmp->mask.bo, NULL))
 			goto cleanup_mask;
+	}
 	gen5_bind_surfaces(sna, tmp);
+	gen5_align_vertex(sna, tmp);
-	gen5_align_vertex(sna, tmp);
+	gen5_bind_surfaces(sna, tmp);
 	return true;
 cleanup_mask:
 				   tmp->base.dst.bo, tmp->base.src.bo,
 				   NULL))
 			goto cleanup_src;
+	}
 	gen5_bind_surfaces(sna, &tmp->base);
+	gen5_align_vertex(sna, &tmp->base);
-	gen5_align_vertex(sna, &tmp->base);
+	gen5_bind_surfaces(sna, &tmp->base);
 	return true;
 cleanup_src:
 	if (!kgem_check_bo(&sna->kgem, dst_bo, src_bo, NULL)) {
 		kgem_submit(&sna->kgem);
 		if (!kgem_check_bo(&sna->kgem, dst_bo, src_bo, NULL)) {
+			DBG(("%s: aperture check failed\n", __FUNCTION__));
+			kgem_bo_destroy(&sna->kgem, tmp.src.bo);
+			if (tmp.redirect.real_bo)
-			DBG(("%s: aperture check failed\n", __FUNCTION__));
+				kgem_bo_destroy(&sna->kgem, tmp.dst.bo);
-			goto fallback_tiled_src;
+			goto fallback_blt;
+		}
+	}
 	dst_dx += tmp.dst.x;
 	dst_dy += tmp.dst.y;
 	tmp.dst.x = tmp.dst.y = 0;
 	src_dx += tmp.src.offset[0];
+	src_dx += tmp.src.offset[0];
 	src_dy += tmp.src.offset[1];
-	gen5_copy_bind_surfaces(sna, &tmp);
+	gen5_align_vertex(sna, &tmp);
 	gen4_vertex_flush(sna);
 	sna_render_composite_redirect_done(sna, &tmp);
 	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
 	return true;
-fallback_tiled_src:
 	kgem_bo_destroy(&sna->kgem, tmp.src.bo);
 fallback_tiled_dst:
 	if (tmp.redirect.real_bo)
 		kgem_bo_destroy(&sna->kgem, tmp.dst.bo);
 fallback_tiled:
 				     dst, dst_bo, dst_dx, dst_dy,
 				     box, n);
+}
-#endif
-static void
-gen5_render_flush(struct sna *sna)
-{
-	gen4_vertex_close(sna);
-	assert(sna->render.vb_id == 0);
-	assert(sna->render.vertex_offset == 0);
-}
 #endif
 static void
 gen5_render_context_switch(struct kgem *kgem,
 			   int new_mode)
+{
 		DBG(("%s: GPU idle, flushing\n", __FUNCTION__));
 		_kgem_submit(kgem);
+	}
+}
-static void
-discard_vbo(struct sna *sna)
-{
-	kgem_bo_destroy(&sna->kgem, sna->render.vbo);
-	sna->render.vbo = NULL;
-	sna->render.vertices = sna->render.vertex_data;
-	sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
-	sna->render.vertex_used = 0;
-	sna->render.vertex_index = 0;
-}
-static void
-gen5_render_retire(struct kgem *kgem)
-{
-	struct sna *sna;
-	sna = container_of(kgem, struct sna, kgem);
-	if (kgem->nbatch == 0 && sna->render.vbo && !kgem_bo_is_busy(sna->render.vbo)) {
-		DBG(("%s: resetting idle vbo\n", __FUNCTION__));
-		sna->render.vertex_used = 0;
-		sna->render.vertex_index = 0;
-	}
-}
-static void
-gen5_render_expire(struct kgem *kgem)
-{
-	struct sna *sna;
-	sna = container_of(kgem, struct sna, kgem);
-	if (sna->render.vbo && !sna->render.vertex_used) {
-		DBG(("%s: discarding vbo\n", __FUNCTION__));
-		discard_vbo(sna);
-	}
-}
 static void gen5_render_reset(struct sna *sna)
+{
 	sna->render_state.gen5.needs_invariant = true;
 	sna->render_state.gen5.ve_id = -1;
 	sna->render_state.gen5.drawrect_offset = -1;
 	sna->render_state.gen5.drawrect_limit = -1;
-	sna->render_state.gen5.surface_table = -1;
+	sna->render_state.gen5.surface_table = -1;
 	if (sna->render.vbo &&
-	    !kgem_bo_is_mappable(&sna->kgem, sna->render.vbo)) {
+	if (sna->render.vbo && !kgem_bo_can_map(&sna->kgem, sna->render.vbo)) {
 		DBG(("%s: discarding unmappable vbo\n", __FUNCTION__));
 		discard_vbo(sna);
+{
 	if (!gen5_render_setup(sna))
 		return backend;
 	sna->kgem.context_switch = gen5_render_context_switch;
-	sna->kgem.retire = gen5_render_retire;
+	sna->kgem.retire = gen4_render_retire;
-	sna->kgem.expire = gen5_render_expire;
+	sna->kgem.expire = gen4_render_expire;
 #if 0
 #if !NO_COMPOSITE
 	sna->render.composite = gen5_render_composite;
 	sna->render.prefer_gpu |= PREFER_GPU_RENDER;
 #endif
 #if !NO_COMPOSITE_SPANS
 	sna->render.check_composite_spans = gen5_check_composite_spans;
 	sna->render.composite_spans = gen5_render_composite_spans;
-	if (sna->PciInfo->device_id == 0x0044)
+	if (intel_get_device_id(sna->scrn) == 0x0044)
 		sna->render.prefer_gpu |= PREFER_GPU_SPANS;
 #endif
 #endif
     sna->render.blit_tex = gen5_blit_tex;
     sna->render.caps = HW_BIT_BLIT | HW_TEX_BLIT;
-	sna->render.flush = gen5_render_flush;
+	sna->render.flush = gen4_render_flush;
 	sna->render.reset = gen5_render_reset;
 	sna->render.fini = gen5_render_fini;
 	if (!kgem_check_bo(&sna->kgem,
 			   tmp->dst.bo, tmp->src.bo, tmp->mask.bo, NULL)) {
 		kgem_submit(&sna->kgem);
+	}
 	gen5_bind_surfaces(sna, tmp);
 	gen5_align_vertex(sna, tmp);
+	gen5_bind_surfaces(sna, tmp);
 	return true;

Subversion Repositories Kolibri OS

(root)/contrib/sdk/sources/Intel-2D/sna/gen5_render.c – Rev 4359 → 4501