Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3265 → Rev 3266

/drivers/video/Intel-2D/kgem-sna.c
3776,9 → 3776,18
 
assert((read_write_domain & 0x7fff) == 0 || bo != NULL);
 
// if( bo != NULL && bo->handle == -1)
// return 0;
if( bo != NULL && bo->handle == -2)
{
if (bo->exec == NULL)
kgem_add_bo(kgem, bo);
if (read_write_domain & 0x7fff && !bo->dirty) {
assert(!bo->snoop || kgem->can_blt_cpu);
__kgem_bo_mark_dirty(bo);
}
return 0;
};
index = kgem->nreloc++;
assert(index < ARRAY_SIZE(kgem->reloc));
kgem->reloc[index].offset = pos * sizeof(kgem->batch[0]);
/drivers/video/Intel-2D/sna.c
32,6 → 32,14
return retval;
};
 
static inline void get_proc_info(char *info)
{
__asm__ __volatile__(
"int $0x40"
:
:"a"(9), "b"(info), "c"(-1));
}
 
const struct intel_device_info *
intel_detect_chipset(struct pci_device *pci);
 
336,6 → 344,14
struct _Pixmap src, dst;
struct kgem_bo *src_bo;
 
char proc_info[1024];
int winx, winy;
 
get_proc_info(proc_info);
 
winx = *(uint32_t*)(proc_info+34);
winy = *(uint32_t*)(proc_info+38);
memset(&src, 0, sizeof(src));
memset(&dst, 0, sizeof(dst));
 
355,7 → 371,7
&src, src_bo,
&dst, sna_fb.fb_bo, &copy) )
{
copy.blt(sna_device, &copy, src_x, src_y, w, h, dst_x, dst_y);
copy.blt(sna_device, &copy, src_x, src_y, w, h, winx+dst_x, winy+dst_y);
copy.done(sna_device, &copy);
}
 
390,7 → 406,21
err_1:
return -1;
};
 
void sna_lock_bitmap(bitmap_t *bitmap)
{
struct kgem_bo *bo;
bo = (struct kgem_bo *)bitmap->handle;
kgem_bo_sync__cpu(&sna_device->kgem, bo);
 
};
 
 
 
/*
 
int sna_blit_tex(bitmap_t *dst_bitmap, int dst_x, int dst_y,