Mesa (pipe-video): [g3dvl] fix a couple of bugs around paletted subpictures
Christian König
deathsimple at kemper.freedesktop.org
Wed Apr 27 15:12:35 UTC 2011
Module: Mesa
Branch: pipe-video
Commit: 76d881b8b086495081c0a3c8fea2278f1480f107
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=76d881b8b086495081c0a3c8fea2278f1480f107
Author: Christian König <deathsimple at vodafone.de>
Date: Wed Apr 27 10:41:19 2011 +0200
[g3dvl] fix a couple of bugs around paletted subpictures
---
src/gallium/auxiliary/vl/vl_compositor.c | 46 ++++++++++++++-------
src/gallium/auxiliary/vl/vl_compositor.h | 4 +-
src/gallium/state_trackers/xorg/xvmc/subpicture.c | 22 ++++++----
3 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c
index e487abf..df66a2d 100644
--- a/src/gallium/auxiliary/vl/vl_compositor.c
+++ b/src/gallium/auxiliary/vl/vl_compositor.c
@@ -115,31 +115,41 @@ static void *
create_frag_shader_palette(struct vl_compositor *c)
{
struct ureg_program *shader;
+ struct ureg_src csc[3];
struct ureg_src tc;
struct ureg_src sampler;
struct ureg_src palette;
struct ureg_dst texel;
struct ureg_dst fragment;
+ unsigned i;
shader = ureg_create(TGSI_PROCESSOR_FRAGMENT);
if (!shader)
return false;
+ for (i = 0; i < 3; ++i)
+ csc[i] = ureg_DECL_constant(shader, i);
+
tc = ureg_DECL_fs_input(shader, TGSI_SEMANTIC_GENERIC, 1, TGSI_INTERPOLATE_LINEAR);
sampler = ureg_DECL_sampler(shader, 0);
palette = ureg_DECL_sampler(shader, 1);
- fragment = ureg_DECL_output(shader, TGSI_SEMANTIC_COLOR, 0);
texel = ureg_DECL_temporary(shader);
+ fragment = ureg_DECL_output(shader, TGSI_SEMANTIC_COLOR, 0);
/*
* texel = tex(tc, sampler)
- * fragment.xyz = tex(texel, palette)
+ * fragment.xyz = tex(texel, palette) * csc
* fragment.a = texel.a
*/
ureg_TEX(shader, texel, TGSI_TEXTURE_2D, tc, sampler);
- ureg_TEX(shader, fragment, TGSI_TEXTURE_1D, ureg_src(texel), palette);
+ ureg_MUL(shader, ureg_writemask(texel, TGSI_WRITEMASK_X), ureg_src(texel), ureg_imm1f(shader, 15.0f / 16.0f));
ureg_MOV(shader, ureg_writemask(fragment, TGSI_WRITEMASK_W), ureg_src(texel));
+ ureg_TEX(shader, texel, TGSI_TEXTURE_1D, ureg_src(texel), palette);
+
+ for (i = 0; i < 3; ++i)
+ ureg_DP4(shader, ureg_writemask(fragment, TGSI_WRITEMASK_X << i), csc[i], ureg_src(texel));
+
ureg_release_temporary(shader, texel);
ureg_END(shader);
@@ -242,12 +252,12 @@ init_pipe_state(struct vl_compositor *c)
sampler.compare_mode = PIPE_TEX_COMPARE_NONE;
sampler.compare_func = PIPE_FUNC_ALWAYS;
sampler.normalized_coords = 1;
- /*sampler.lod_bias = ;*/
- /*sampler.min_lod = ;*/
- /*sampler.max_lod = ;*/
- /*sampler.border_color[i] = ;*/
- /*sampler.max_anisotropy = ;*/
- c->sampler = c->pipe->create_sampler_state(c->pipe, &sampler);
+
+ c->sampler_linear = c->pipe->create_sampler_state(c->pipe, &sampler);
+
+ sampler.min_img_filter = PIPE_TEX_FILTER_NEAREST;
+ sampler.mag_img_filter = PIPE_TEX_FILTER_NEAREST;
+ c->sampler_nearest = c->pipe->create_sampler_state(c->pipe, &sampler);
memset(&blend, 0, sizeof blend);
blend.independent_blend_enable = 0;
@@ -286,7 +296,8 @@ static void cleanup_pipe_state(struct vl_compositor *c)
{
assert(c);
- c->pipe->delete_sampler_state(c->pipe, c->sampler);
+ c->pipe->delete_sampler_state(c->pipe, c->sampler_linear);
+ c->pipe->delete_sampler_state(c->pipe, c->sampler_nearest);
c->pipe->delete_blend_state(c->pipe, c->blend);
c->pipe->delete_rasterizer_state(c->pipe, c->rast);
}
@@ -430,6 +441,7 @@ draw_layers(struct vl_compositor *c)
unsigned num_sampler_views = !samplers[1] ? 1 : !samplers[2] ? 2 : 3;
c->pipe->bind_fs_state(c->pipe, c->layers[i].fs);
+ c->pipe->bind_fragment_sampler_states(c->pipe, num_sampler_views, c->layers[i].samplers);
c->pipe->set_fragment_sampler_views(c->pipe, num_sampler_views, samplers);
util_draw_arrays(c->pipe, PIPE_PRIM_QUADS, vb_index * 4, 4);
vb_index++;
@@ -507,8 +519,10 @@ vl_compositor_set_buffer_layer(struct pipe_video_compositor *compositor,
c->layers[layer].fs = c->fs_video_buffer;
sampler_views = buffer->get_sampler_view_components(buffer);
- for (i = 0; i < 3; ++i)
+ for (i = 0; i < 3; ++i) {
+ c->layers[layer].samplers[i] = c->sampler_linear;
pipe_sampler_view_reference(&c->layers[layer].sampler_views[i], sampler_views[i]);
+ }
c->layers[layer].src_rect = src_rect ? *src_rect : default_rect(&c->layers[layer]);
c->layers[layer].dst_rect = dst_rect ? *dst_rect : default_rect(&c->layers[layer]);
@@ -529,6 +543,9 @@ vl_compositor_set_palette_layer(struct pipe_video_compositor *compositor,
c->used_layers |= 1 << layer;
c->layers[layer].fs = c->fs_palette;
+ c->layers[layer].samplers[0] = c->sampler_linear;
+ c->layers[layer].samplers[1] = c->sampler_nearest;
+ c->layers[layer].samplers[2] = NULL;
pipe_sampler_view_reference(&c->layers[layer].sampler_views[0], indexes);
pipe_sampler_view_reference(&c->layers[layer].sampler_views[1], palette);
pipe_sampler_view_reference(&c->layers[layer].sampler_views[2], NULL);
@@ -550,6 +567,9 @@ vl_compositor_set_rgba_layer(struct pipe_video_compositor *compositor,
c->used_layers |= 1 << layer;
c->layers[layer].fs = c->fs_rgba;
+ c->layers[layer].samplers[0] = c->sampler_linear;
+ c->layers[layer].samplers[1] = NULL;
+ c->layers[layer].samplers[2] = NULL;
pipe_sampler_view_reference(&c->layers[layer].sampler_views[0], rgba);
pipe_sampler_view_reference(&c->layers[layer].sampler_views[1], NULL);
pipe_sampler_view_reference(&c->layers[layer].sampler_views[2], NULL);
@@ -566,7 +586,6 @@ vl_compositor_render(struct pipe_video_compositor *compositor,
{
struct vl_compositor *c = (struct vl_compositor *)compositor;
struct pipe_scissor_state scissor;
- void *samplers[3];
assert(compositor);
assert(dst_surface);
@@ -590,14 +609,11 @@ vl_compositor_render(struct pipe_video_compositor *compositor,
scissor.maxy = dst_surface->height;
}
- samplers[0] = samplers[1] = samplers[2] = c->sampler;
-
gen_vertex_data(c);
c->pipe->set_scissor_state(c->pipe, &scissor);
c->pipe->set_framebuffer_state(c->pipe, &c->fb_state);
c->pipe->set_viewport_state(c->pipe, &c->viewport);
- c->pipe->bind_fragment_sampler_states(c->pipe, 3, &samplers[0]);
c->pipe->bind_vs_state(c->pipe, c->vs);
c->pipe->set_vertex_buffers(c->pipe, 1, &c->vertex_buf);
c->pipe->bind_vertex_elements_state(c->pipe, c->vertex_elems_state);
diff --git a/src/gallium/auxiliary/vl/vl_compositor.h b/src/gallium/auxiliary/vl/vl_compositor.h
index c7da533..0bce04f 100644
--- a/src/gallium/auxiliary/vl/vl_compositor.h
+++ b/src/gallium/auxiliary/vl/vl_compositor.h
@@ -39,6 +39,7 @@ struct pipe_context;
struct vl_compositor_layer
{
void *fs;
+ void *samplers[3];
struct pipe_sampler_view *sampler_views[3];
struct pipe_video_rect src_rect;
struct pipe_video_rect dst_rect;
@@ -54,7 +55,8 @@ struct vl_compositor
struct pipe_vertex_buffer vertex_buf;
struct pipe_resource *csc_matrix;
- void *sampler;
+ void *sampler_linear;
+ void *sampler_nearest;
void *blend;
void *rast;
void *vertex_elems_state;
diff --git a/src/gallium/state_trackers/xorg/xvmc/subpicture.c b/src/gallium/state_trackers/xorg/xvmc/subpicture.c
index 68519c0..821c87e 100644
--- a/src/gallium/state_trackers/xorg/xvmc/subpicture.c
+++ b/src/gallium/state_trackers/xorg/xvmc/subpicture.c
@@ -92,14 +92,14 @@ static void XvIDToSwizzle(int xvimage_id, struct pipe_sampler_view *tmpl)
tmpl->swizzle_a = PIPE_SWIZZLE_ONE;
break;
- case FOURCC_AI44:
+ case FOURCC_IA44:
tmpl->swizzle_r = PIPE_SWIZZLE_ALPHA;
tmpl->swizzle_g = PIPE_SWIZZLE_ZERO;
tmpl->swizzle_b = PIPE_SWIZZLE_ZERO;
tmpl->swizzle_a = PIPE_SWIZZLE_RED;
break;
- case FOURCC_IA44:
+ case FOURCC_AI44:
tmpl->swizzle_r = PIPE_SWIZZLE_RED;
tmpl->swizzle_g = PIPE_SWIZZLE_ZERO;
tmpl->swizzle_b = PIPE_SWIZZLE_ZERO;
@@ -117,10 +117,10 @@ static int PipeToComponentOrder(enum pipe_format format, char *component_order)
return 0;
case PIPE_FORMAT_L4A4_UNORM:
- component_order[0] = PIPE_SWIZZLE_RED;
- component_order[1] = PIPE_SWIZZLE_GREEN;
- component_order[2] = PIPE_SWIZZLE_BLUE;
- component_order[3] = PIPE_SWIZZLE_ALPHA;
+ component_order[0] = 'Y';
+ component_order[1] = 'U';
+ component_order[2] = 'V';
+ component_order[3] = 'A';
return 4;
default:
@@ -271,7 +271,7 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *
if (subpicture->num_palette_entries > 0) {
tex_templ.target = PIPE_TEXTURE_1D;
- tex_templ.format = PIPE_FORMAT_B8G8R8A8_UNORM;
+ tex_templ.format = PIPE_FORMAT_R8G8B8A8_UNORM;
tex_templ.width0 = subpicture->num_palette_entries;
tex_templ.height0 = 1;
tex_templ.usage = PIPE_USAGE_STATIC;
@@ -280,6 +280,7 @@ Status XvMCCreateSubpicture(Display *dpy, XvMCContext *context, XvMCSubpicture *
memset(&sampler_templ, 0, sizeof(sampler_templ));
u_sampler_view_default_template(&sampler_templ, tex, tex->format);
+ sampler_templ.swizzle_a = PIPE_SWIZZLE_ONE;
subpicture_priv->palette = vpipe->create_sampler_view(vpipe, tex, &sampler_templ);
pipe_resource_reference(&tex, NULL);
if (!subpicture_priv->sampler) {
@@ -333,6 +334,7 @@ Status XvMCCompositeSubpicture(Display *dpy, XvMCSubpicture *subpicture, XvImage
XvMCContextPrivate *context_priv;
struct pipe_video_context *vpipe;
struct pipe_box dst_box = {dstx, dsty, 0, width, height, 1};
+ unsigned src_stride;
XVMC_MSG(XVMC_TRACE, "[XvMC] Compositing subpicture %p.\n", subpicture);
@@ -354,9 +356,11 @@ Status XvMCCompositeSubpicture(Display *dpy, XvMCSubpicture *subpicture, XvImage
context_priv = subpicture_priv->context->privData;
vpipe = context_priv->vctx->vpipe;
- /* TODO: Assert rects are within bounds? Or clip? */
+ /* clipping should be done by upload_sampler and regardles what the documentation
+ says image->pitches[0] doesn't seems to be in bytes, so don't use it */
+ src_stride = image->width * util_format_get_blocksize(subpicture_priv->sampler->texture->format);
vpipe->upload_sampler(vpipe, subpicture_priv->sampler, &dst_box,
- image->data, image->pitches[0], srcx, srcy);
+ image->data, src_stride, srcx, srcy);
XVMC_MSG(XVMC_TRACE, "[XvMC] Subpicture %p composited.\n", subpicture);
More information about the mesa-commit
mailing list