fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-20 02:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[g3dvl] make clear color configureable

Browse source
This commit is contained in:
Christian König 2011-04-27 16:50:34 +02:00
parent 221e1b7aba
commit 563f6c225c
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/auxiliary/vl/vl_compositor.c
View file

@ -511,6 +511,18 @@ vl_compositor_reset_dirty_area(struct pipe_video_compositor *compositor)
c->dirty_br.x = c->dirty_br.y = 1.0f;
}
static void
vl_compositor_set_clear_color(struct pipe_video_compositor *compositor, float color[4])
{
struct vl_compositor *c = (struct vl_compositor *)compositor;
unsigned i;
assert(compositor);
for (i = 0; i < 4; ++i)
c->clear_color[i] = color[i];
}
static void
vl_compositor_clear_layers(struct pipe_video_compositor *compositor)
{
@ -655,7 +667,6 @@ vl_compositor_render(struct pipe_video_compositor *compositor,
{
struct vl_compositor *c = (struct vl_compositor *)compositor;
struct pipe_scissor_state scissor;
float clearcolor[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
assert(compositor);
assert(dst_surface);
@ -682,7 +693,7 @@ vl_compositor_render(struct pipe_video_compositor *compositor,
gen_vertex_data(c);
if (c->dirty_tl.x < c->dirty_br.x || c->dirty_tl.y < c->dirty_br.y) {
util_clear_render_target(c->pipe, dst_surface, clearcolor, 0, 0, dst_surface->width, dst_surface->height);
util_clear_render_target(c->pipe, dst_surface, c->clear_color, 0, 0, dst_surface->width, dst_surface->height);
c->dirty_tl.x = c->dirty_tl.y = 1.0f;
c->dirty_br.x = c->dirty_br.y = 0.0f;
}
@ -714,6 +725,7 @@ vl_compositor_init(struct pipe_video_context *vpipe, struct pipe_context *pipe)
compositor->base.destroy = vl_compositor_destroy;
compositor->base.set_csc_matrix = vl_compositor_set_csc_matrix;
compositor->base.reset_dirty_area = vl_compositor_reset_dirty_area;
compositor->base.set_clear_color = vl_compositor_set_clear_color;
compositor->base.clear_layers = vl_compositor_clear_layers;
compositor->base.set_buffer_layer = vl_compositor_set_buffer_layer;
compositor->base.set_palette_layer = vl_compositor_set_palette_layer;
@ -739,6 +751,9 @@ vl_compositor_init(struct pipe_video_context *vpipe, struct pipe_context *pipe)
vl_csc_get_matrix(VL_CSC_COLOR_STANDARD_IDENTITY, NULL, true, csc_matrix);
vl_compositor_set_csc_matrix(&compositor->base, csc_matrix);
compositor->clear_color[0] = compositor->clear_color[1] = 0.0f;
compositor->clear_color[2] = compositor->clear_color[3] = 0.0f;
vl_compositor_reset_dirty_area(&compositor->base);
return &compositor->base;

1
src/gallium/auxiliary/vl/vl_compositor.h
View file

@ -72,6 +72,7 @@ struct vl_compositor
void *fs_palette;
void *fs_rgba;
float clear_color[4];
struct vertex2f dirty_tl, dirty_br;
unsigned used_layers:VL_COMPOSITOR_MAX_LAYERS;

5
src/gallium/include/pipe/p_video_context.h
View file

@ -269,6 +269,11 @@ struct pipe_video_compositor
*/
void (*reset_dirty_area)(struct pipe_video_compositor *compositor);
/**
* set the clear color
*/
void (*set_clear_color)(struct pipe_video_compositor *compositor, float color[4]);
/**
* set overlay samplers
*/