Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

intel-2D: use tiled framebuffer

Browse Source 
git-svn-id: svn://kolibrios.org@4281 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2013-11-22 14:47:08 +00:00
parent 304eb30a10
commit f34b044d15
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/video/Intel-2D/gen4_render.c
View File

@ -2391,11 +2391,11 @@ gen4_blit_tex(struct sna *sna,
// tmp->mask.offset[0] = -dst_x; // tmp->mask.offset[0] = -dst_x;
// tmp->mask.offset[1] = -dst_y; // tmp->mask.offset[1] = -dst_y;
tmp->u.gen4.wm_kernel = tmp->u.gen4.wm_kernel = WM_KERNEL_MASK;
gen4_choose_composite_kernel(tmp->op, // gen4_choose_composite_kernel(tmp->op,
tmp->mask.bo != NULL, // tmp->mask.bo != NULL,
tmp->has_component_alpha, // tmp->has_component_alpha,
tmp->is_affine); // tmp->is_affine);
tmp->u.gen4.ve_id = gen4_choose_composite_emitter(sna, tmp); tmp->u.gen4.ve_id = gen4_choose_composite_emitter(sna, tmp);
tmp->blt = gen4_render_composite_blt; tmp->blt = gen4_render_composite_blt;

14
drivers/video/Intel-2D/gen5_render.c
View File

@ -302,6 +302,8 @@ static uint32_t gen5_get_card_format(PictFormat format)
static uint32_t gen5_get_dest_format(PictFormat format) static uint32_t gen5_get_dest_format(PictFormat format)
{ {
return GEN5_SURFACEFORMAT_B8G8R8A8_UNORM;
#if 0
switch (format) { switch (format) {
default: default:
return -1; return -1;
@ -325,6 +327,7 @@ static uint32_t gen5_get_dest_format(PictFormat format)
case PICT_x4r4g4b4: case PICT_x4r4g4b4:
return GEN5_SURFACEFORMAT_B4G4R4A4_UNORM; return GEN5_SURFACEFORMAT_B4G4R4A4_UNORM;
} }
#endif
} }
typedef struct gen5_surface_state_padded { typedef struct gen5_surface_state_padded {
struct gen5_surface_state state; struct gen5_surface_state state;
@ -2447,11 +2450,12 @@ gen5_blit_tex(struct sna *sna,
tmp->mask.scale[1] = 1.f/mask->drawable.height; tmp->mask.scale[1] = 1.f/mask->drawable.height;
tmp->u.gen5.wm_kernel = tmp->u.gen5.wm_kernel = WM_KERNEL_MASK;
gen5_choose_composite_kernel(tmp->op,
tmp->mask.bo != NULL, // gen5_choose_composite_kernel(tmp->op,
tmp->has_component_alpha, // tmp->mask.bo != NULL,
tmp->is_affine); // tmp->has_component_alpha,
// tmp->is_affine);
tmp->u.gen5.ve_id = gen4_choose_composite_emitter(sna, tmp); tmp->u.gen5.ve_id = gen4_choose_composite_emitter(sna, tmp);
tmp->blt = gen5_render_composite_blt; tmp->blt = gen5_render_composite_blt;

2
drivers/video/Intel-2D/gen6_render.c
View File

@ -2727,9 +2727,7 @@ fallback:
op->done = gen6_render_copy_done; op->done = gen6_render_copy_done;
return true; return true;
} }
#endif
#if 0
static void static void
gen6_emit_fill_state(struct sna *sna, const struct sna_composite_op *op) gen6_emit_fill_state(struct sna *sna, const struct sna_composite_op *op)
{ {

2
drivers/video/Intel-2D/kgem.c
View File

@ -5326,7 +5326,7 @@ int kgem_init_fb(struct kgem *kgem, struct sna_fb *fb)
bo->domain = DOMAIN_GTT; bo->domain = DOMAIN_GTT;
bo->unique_id = kgem_get_unique_id(kgem); bo->unique_id = kgem_get_unique_id(kgem);
bo->pitch = fb->pitch; bo->pitch = fb->pitch;
bo->tiling = I915_TILING_NONE; bo->tiling = I915_TILING_X;
bo->scanout = 1; bo->scanout = 1;
fb->fb_bo = bo; fb->fb_bo = bo;