Subversion Repositories Kolibri OS

Rev

Rev 2351 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2351 Rev 2352
Line 367... Line 367...
367 
gen6_emit_state_base_address(struct sna *sna)
 367 
gen6_emit_state_base_address(struct sna *sna)
368 
{
 368 
{
369 
	OUT_BATCH(GEN6_STATE_BASE_ADDRESS | (10 - 2));
 369 
	OUT_BATCH(GEN6_STATE_BASE_ADDRESS | (10 - 2));
370 
	OUT_BATCH(0); /* general */
 370 
	OUT_BATCH(0); /* general */
Line 371... Line -...
371 
 
 - 
 
372 
//   OUT_BATCH(kgem_add_reloc(&sna->kgem, /* surface */
 - 
 
373 
//                sna->kgem.nbatch,
 - 
 
374 
//                NULL,
 - 
 
375 
//                I915_GEM_DOMAIN_INSTRUCTION << 16,
 - 
 
376 
//                 BASE_ADDRESS_MODIFY));
 - 
 
377 
 
 371 
 
378 
    OUT_BATCH((sna->kgem.batch_obj->gtt_offset+
 372 
    OUT_BATCH((sna->kgem.batch_obj->gtt_offset+
Line 379... Line -...
379 
              sna->kgem.batch_idx*4096)|BASE_ADDRESS_MODIFY);
 - 
 
380 
 
 - 
 
381 
//   OUT_BATCH(kgem_add_reloc(&sna->kgem, /* instruction */
 - 
 
382 
//                sna->kgem.nbatch,
 - 
 
383 
//                sna->render_state.gen6.general_bo,
 - 
 
384 
//                I915_GEM_DOMAIN_INSTRUCTION << 16,
 - 
 
385 
//                BASE_ADDRESS_MODIFY));
 373 
              sna->kgem.batch_idx*4096)|BASE_ADDRESS_MODIFY);
Line 386... Line 374...
386 
 
 374 
 
387 
    OUT_BATCH(sna->render_state.gen6.general_bo->gaddr|BASE_ADDRESS_MODIFY);
 - 
 
388 
 
 - 
 
389 
	OUT_BATCH(0); /* indirect */
 - 
 
390 
//   OUT_BATCH(kgem_add_reloc(&sna->kgem,
 - 
 
391 
//                sna->kgem.nbatch,
 - 
 
Line 392... Line 375...
392 
//                sna->render_state.gen6.general_bo,
 375 
    OUT_BATCH(sna->render_state.gen6.general_bo->gaddr|BASE_ADDRESS_MODIFY);
Line 393... Line 376...
393 
//                I915_GEM_DOMAIN_INSTRUCTION << 16,
 376 
 
394 
//                BASE_ADDRESS_MODIFY));
 377 
	OUT_BATCH(0); /* indirect */
Line 978... Line 961...
978 
	for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) {
 961 
	for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) {
979 
		if (sna->render.vertex_reloc[i]) {
 962 
		if (sna->render.vertex_reloc[i]) {
980 
			DBG(("%s: reloc[%d] = %d\n", __FUNCTION__,
 963 
			DBG(("%s: reloc[%d] = %d\n", __FUNCTION__,
981 
			     i, sna->render.vertex_reloc[i]));
 964 
			     i, sna->render.vertex_reloc[i]));
Line 982... Line -...
982 
 
 - 
 
983 
//           sna->kgem.batch[sna->render.vertex_reloc[i]] =
 - 
 
984 
//               kgem_add_reloc(&sna->kgem,
 - 
 
985 
//                          sna->render.vertex_reloc[i],
 - 
 
986 
//                          bo,
 - 
 
987 
//                          I915_GEM_DOMAIN_VERTEX << 16,
 - 
 
988 
//                          delta);
 965 
 
989 
            sna->kgem.batch[sna->render.vertex_reloc[i]] =
 966 
            sna->kgem.batch[sna->render.vertex_reloc[i]] =
990 
                            sna->kgem.batch_obj->gtt_offset+delta+
 967 
                            sna->kgem.batch_obj->gtt_offset+delta+
Line 991... Line -...
991 
                            sna->kgem.batch_idx*4096;
 - 
 
992 
 
 - 
 
993 
//           sna->kgem.batch[sna->render.vertex_reloc[i]+1] =
 - 
 
994 
//               kgem_add_reloc(&sna->kgem,
 - 
 
995 
//                          sna->render.vertex_reloc[i]+1,
 - 
 
996 
//                          bo,
 - 
 
997 
//                          I915_GEM_DOMAIN_VERTEX << 16,
 - 
 
998 
//                          delta + sna->render.vertex_used * 4 - 1);
 968 
                            sna->kgem.batch_idx*4096;
999 
 
 969 
 
1000 
            sna->kgem.batch[sna->render.vertex_reloc[i]+1] =
 970 
            sna->kgem.batch[sna->render.vertex_reloc[i]+1] =
1001 
                            sna->kgem.batch_obj->gtt_offset+delta+
 971 
                            sna->kgem.batch_obj->gtt_offset+delta+
Line 1679... Line 1649...
1679 
		     int16_t sx, int16_t sy,
 1649 
		     int16_t sx, int16_t sy,
1680 
		     int16_t w,  int16_t h,
 1650 
		     int16_t w,  int16_t h,
1681 
		     int16_t dx, int16_t dy)
 1651 
		     int16_t dx, int16_t dy)
1682 
{
 1652 
{
1683 
    if (unlikely(!gen6_get_rectangles(sna, op, 1))) {
 1653 
    if (unlikely(!gen6_get_rectangles(sna, op, 1))) {
1684 
		_kgem_submit(&sna->kgem);
 1654 
//       _kgem_submit(&sna->kgem);
1685 
        gen6_emit_copy_state(sna, op);
 1655 
        gen6_emit_copy_state(sna, op);
1686 
        gen6_get_rectangles(sna, op, 1);
 1656 
        gen6_get_rectangles(sna, op, 1);
1687 
	}
 1657 
	}
Line 1688... Line 1658...
1688 
 
 1658 
 
Line 1766... Line 1736...
1766 
    gen6_align_vertex(sna, &op);
 1736 
    gen6_align_vertex(sna, &op);
Line 1767... Line 1737...
1767 
 
 1737 
 
1768 
    gen6_render_copy_blt(sna, &op, src_x, src_y, w, h, dst_x, dst_y);
 1738 
    gen6_render_copy_blt(sna, &op, src_x, src_y, w, h, dst_x, dst_y);
Line 1769... Line -...
1769 
    gen6_render_copy_done(sna);
 - 
 
1770 
 
 - 
 
1771 
    _kgem_submit(&sna->kgem);
 1739 
    gen6_render_copy_done(sna);
1772 
 
 1740 
 
Line 1773... Line 1741...
1773 
	return TRUE;
 1741 
	return TRUE;
1774 
}
 1742 
}
Line 1854... Line 1822...
1854 
 
 1822 
 
1855 
	gen6_emit_fill_state(sna, &tmp);
 1823 
	gen6_emit_fill_state(sna, &tmp);
Line 1856... Line 1824...
1856 
	gen6_align_vertex(sna, &tmp);
 1824 
	gen6_align_vertex(sna, &tmp);
1857 
 
 1825 
 
1858 
	if (unlikely(!gen6_get_rectangles(sna, &tmp, 1))) {
 1826 
	if (unlikely(!gen6_get_rectangles(sna, &tmp, 1))) {
1859 
		_kgem_submit(&sna->kgem);
 1827 
//       _kgem_submit(&sna->kgem);
1860 
		gen6_emit_fill_state(sna, &tmp);
 1828 
		gen6_emit_fill_state(sna, &tmp);
Line 1861... Line 1829...
1861 
		gen6_get_rectangles(sna, &tmp, 1);
 1829 
		gen6_get_rectangles(sna, &tmp, 1);
Line 1874... Line 1842...
1874 
	OUT_VERTEX_F(0);
 1842 
	OUT_VERTEX_F(0);
Line 1875... Line 1843...
1875 
 
 1843 
 
1876 
    gen6_vertex_flush(sna);
 1844 
    gen6_vertex_flush(sna);
1877 
//   kgem_bo_destroy(&sna->kgem, tmp.src.bo);
 1845 
//   kgem_bo_destroy(&sna->kgem, tmp.src.bo);
1878 
//    gen6_render_composite_done(sna, &tmp);
 1846 
//    gen6_render_composite_done(sna, &tmp);
Line 1879... Line 1847...
1879 
    _kgem_submit(&sna->kgem);
 1847 
//    _kgem_submit(&sna->kgem);
1880 
 
 1848 
 
Line 1881... Line 1849...
1881 
	return TRUE;
 1849 
	return TRUE;