diff options
Diffstat (limited to 'src/gallium/auxiliary/vl')
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_compositor.c | 44 | ||||
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_compositor.h | 4 |
2 files changed, 35 insertions, 13 deletions
diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c index acb2f4f4b97..1a383f29425 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.c +++ b/src/gallium/auxiliary/vl/vl_compositor.c @@ -132,8 +132,10 @@ create_frag_shader_video_buffer(struct vl_compositor *c) struct ureg_src tc; struct ureg_src csc[3]; struct ureg_src sampler[3]; + struct ureg_src lumakey; struct ureg_dst texel; struct ureg_dst fragment; + struct ureg_dst temp[2]; unsigned i; shader = ureg_create(PIPE_SHADER_FRAGMENT); @@ -145,6 +147,11 @@ create_frag_shader_video_buffer(struct vl_compositor *c) csc[i] = ureg_DECL_constant(shader, i); sampler[i] = ureg_DECL_sampler(shader, i); } + + for (i = 0; i < 2; ++i) + temp[i] = ureg_DECL_temporary(shader); + + lumakey = ureg_DECL_constant(shader, 3); texel = ureg_DECL_temporary(shader); fragment = ureg_DECL_output(shader, TGSI_SEMANTIC_COLOR, 0); @@ -160,7 +167,17 @@ create_frag_shader_video_buffer(struct vl_compositor *c) for (i = 0; i < 3; ++i) ureg_DP4(shader, ureg_writemask(fragment, TGSI_WRITEMASK_X << i), csc[i], ureg_src(texel)); - ureg_MOV(shader, ureg_writemask(fragment, TGSI_WRITEMASK_W), ureg_imm1f(shader, 1.0f)); + ureg_MOV(shader, ureg_writemask(temp[0], TGSI_WRITEMASK_W), + ureg_scalar(ureg_src(texel), TGSI_SWIZZLE_Z)); + ureg_SLE(shader, ureg_writemask(temp[1],TGSI_WRITEMASK_W), + ureg_src(temp[0]), ureg_scalar(lumakey, TGSI_SWIZZLE_X)); + ureg_SGT(shader, ureg_writemask(temp[0],TGSI_WRITEMASK_W), + ureg_src(temp[0]), ureg_scalar(lumakey, TGSI_SWIZZLE_Y)); + ureg_MAX(shader, ureg_writemask(fragment, TGSI_WRITEMASK_W), + ureg_src(temp[0]), ureg_src(temp[1])); + + for (i = 0; i < 2; ++i) + ureg_release_temporary(shader, temp[i]); ureg_release_temporary(shader, texel); ureg_END(shader); @@ -852,20 +869,23 @@ vl_compositor_cleanup(struct vl_compositor *c) } void -vl_compositor_set_csc_matrix(struct vl_compositor_state *s, vl_csc_matrix const *matrix) +vl_compositor_set_csc_matrix(struct vl_compositor_state *s, + vl_csc_matrix const *matrix, + float luma_min, float luma_max) { struct pipe_transfer *buf_transfer; assert(s); - memcpy - ( - pipe_buffer_map(s->pipe, s->csc_matrix, - PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE, - &buf_transfer), - matrix, - sizeof(vl_csc_matrix) - ); + float *ptr = pipe_buffer_map(s->pipe, s->csc_matrix, + PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE, + &buf_transfer); + + memcpy(ptr, matrix, sizeof(vl_csc_matrix)); + + ptr += sizeof(vl_csc_matrix)/sizeof(float); + ptr[0] = luma_min; + ptr[1] = luma_max; pipe_buffer_unmap(s->pipe, buf_transfer); } @@ -1142,13 +1162,13 @@ vl_compositor_init_state(struct vl_compositor_state *s, struct pipe_context *pip pipe->screen, PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_DEFAULT, - sizeof(csc_matrix) + sizeof(csc_matrix) + 2*sizeof(float) ); vl_compositor_clear_layers(s); vl_csc_get_matrix(VL_CSC_COLOR_STANDARD_IDENTITY, NULL, true, &csc_matrix); - vl_compositor_set_csc_matrix(s, (const vl_csc_matrix *)&csc_matrix); + vl_compositor_set_csc_matrix(s, (const vl_csc_matrix *)&csc_matrix, 1.0f, 0.0f); return true; } diff --git a/src/gallium/auxiliary/vl/vl_compositor.h b/src/gallium/auxiliary/vl/vl_compositor.h index 934b634b390..12976fc95a1 100644 --- a/src/gallium/auxiliary/vl/vl_compositor.h +++ b/src/gallium/auxiliary/vl/vl_compositor.h @@ -138,7 +138,9 @@ vl_compositor_init_state(struct vl_compositor_state *state, struct pipe_context * set yuv -> rgba conversion matrix */ void -vl_compositor_set_csc_matrix(struct vl_compositor_state *settings, const vl_csc_matrix *matrix); +vl_compositor_set_csc_matrix(struct vl_compositor_state *settings, + const vl_csc_matrix *matrix, + float luma_min, float luma_max); /** * reset dirty area, so it's cleared with the clear colour |