[Mesa-dev] [PATCH v6 5/5] gallium/auxiliary/vl: Add video compositor compute shader render
James Zhu
jamesz at amd.com
Thu Feb 14 22:13:52 UTC 2019
On 2019-02-14 4:44 p.m., Marek Olšák wrote:
This still creates gfx shaders. If we switch MM to compute IBs, calling any gfx function will crash.
Right now only fs_video_buffer/fs_weave_rgb/fs_rgba have compute shader replacement.
The other gfx shader will be converted to compute shader later.
James.
Marek
On Tue, Feb 12, 2019, 2:53 PM Zhu, James <James.Zhu at amd.com<mailto:James.Zhu at amd.com> wrote:
Add compute shader initilization, assign and cleanup in vl_compositor API.
Set video compositor compute shader render as default when pipe support it.
Signed-off-by: James Zhu <James.Zhu at amd.com<mailto:James.Zhu at amd.com>>
Reviewed-by: Christian König <christian.koenig at amd.com<mailto:christian.koenig at amd.com>>
---
src/gallium/auxiliary/vl/vl_compositor.c | 106 +++++++++++++++++++++++--------
src/gallium/auxiliary/vl/vl_compositor.h | 5 ++
2 files changed, 83 insertions(+), 28 deletions(-)
diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c
index 4509913..8731ad9 100644
--- a/src/gallium/auxiliary/vl/vl_compositor.c
+++ b/src/gallium/auxiliary/vl/vl_compositor.c
@@ -28,6 +28,7 @@
#include "util/u_sampler.h"
#include "vl_compositor_gfx.h"
+#include "vl_compositor_cs.h"
static bool
init_shaders(struct vl_compositor *c)
@@ -40,18 +41,6 @@ init_shaders(struct vl_compositor *c)
return false;
}
- c->fs_video_buffer = create_frag_shader_video_buffer(c);
- if (!c->fs_video_buffer) {
- debug_printf("Unable to create YCbCr-to-RGB fragment shader.\n");
- return false;
- }
-
- c->fs_weave_rgb = create_frag_shader_weave_rgb(c);
- if (!c->fs_weave_rgb) {
- debug_printf("Unable to create YCbCr-to-RGB weave fragment shader.\n");
- return false;
- }
-
c->fs_yuv.weave.y = create_frag_shader_deint_yuv(c, true, true);
c->fs_yuv.weave.uv = create_frag_shader_deint_yuv(c, false, true);
c->fs_yuv.bob.y = create_frag_shader_deint_yuv(c, true, false);
@@ -74,12 +63,6 @@ init_shaders(struct vl_compositor *c)
return false;
}
- c->fs_rgba = create_frag_shader_rgba(c);
- if (!c->fs_rgba) {
- debug_printf("Unable to create RGB-to-RGB fragment shader.\n");
- return false;
- }
-
c->fs_rgb_yuv.y = create_frag_shader_rgb_yuv(c, true);
c->fs_rgb_yuv.uv = create_frag_shader_rgb_yuv(c, false);
if (!c->fs_rgb_yuv.y || !c->fs_rgb_yuv.uv) {
@@ -87,6 +70,44 @@ init_shaders(struct vl_compositor *c)
return false;
}
+ if (c->pipe_compute_supported) {
+ c->cs_video_buffer = vl_compositor_cs_create_shader(c, compute_shader_video_buffer);
+ if (!c->cs_video_buffer) {
+ debug_printf("Unable to create video_buffer compute shader.\n");
+ return false;
+ }
+
+ c->cs_weave_rgb = vl_compositor_cs_create_shader(c, compute_shader_weave);
+ if (!c->cs_weave_rgb) {
+ debug_printf("Unable to create weave_rgb compute shader.\n");
+ return false;
+ }
+
+ c->cs_rgba = vl_compositor_cs_create_shader(c, compute_shader_rgba);
+ if (!c->cs_rgba) {
+ debug_printf("Unable to create RGB-to-RGB compute shader.\n");
+ return false;
+ }
+ } else {
+ c->fs_video_buffer = create_frag_shader_video_buffer(c);
+ if (!c->fs_video_buffer) {
+ debug_printf("Unable to create YCbCr-to-RGB fragment shader.\n");
+ return false;
+ }
+
+ c->fs_weave_rgb = create_frag_shader_weave_rgb(c);
+ if (!c->fs_weave_rgb) {
+ debug_printf("Unable to create YCbCr-to-RGB weave fragment shader.\n");
+ return false;
+ }
+
+ c->fs_rgba = create_frag_shader_rgba(c);
+ if (!c->fs_rgba) {
+ debug_printf("Unable to create RGB-to-RGB fragment shader.\n");
+ return false;
+ }
+ }
+
return true;
}
@@ -95,17 +116,24 @@ static void cleanup_shaders(struct vl_compositor *c)
assert(c);
c->pipe->delete_vs_state(c->pipe, c->vs);
- c->pipe->delete_fs_state(c->pipe, c->fs_video_buffer);
- c->pipe->delete_fs_state(c->pipe, c->fs_weave_rgb);
c->pipe->delete_fs_state(c->pipe, c->fs_yuv.weave.y);
c->pipe->delete_fs_state(c->pipe, c->fs_yuv.weave.uv);
c->pipe->delete_fs_state(c->pipe, c->fs_yuv.bob.y);
c->pipe->delete_fs_state(c->pipe, c->fs_yuv.bob.uv);
c->pipe->delete_fs_state(c->pipe, c->fs_palette.yuv);
c->pipe->delete_fs_state(c->pipe, c->fs_palette.rgb);
- c->pipe->delete_fs_state(c->pipe, c->fs_rgba);
c->pipe->delete_fs_state(c->pipe, c->fs_rgb_yuv.y);
c->pipe->delete_fs_state(c->pipe, c->fs_rgb_yuv.uv);
+
+ if (c->pipe_compute_supported) {
+ c->pipe->delete_compute_state(c->pipe, c->cs_video_buffer);
+ c->pipe->delete_compute_state(c->pipe, c->cs_weave_rgb);
+ c->pipe->delete_compute_state(c->pipe, c->cs_rgba);
+ } else {
+ c->pipe->delete_fs_state(c->pipe, c->fs_video_buffer);
+ c->pipe->delete_fs_state(c->pipe, c->fs_weave_rgb);
+ c->pipe->delete_fs_state(c->pipe, c->fs_rgba);
+ }
}
static bool
@@ -409,6 +437,7 @@ vl_compositor_clear_layers(struct vl_compositor_state *s)
s->layers[i].clearing = i ? false : true;
s->layers[i].blend = NULL;
s->layers[i].fs = NULL;
+ s->layers[i].cs = NULL;
s->layers[i].viewport.scale[2] = 1;
s->layers[i].viewport.translate[2] = 0;
s->layers[i].rotate = VL_COMPOSITOR_ROTATE_0;
@@ -532,26 +561,39 @@ vl_compositor_set_buffer_layer(struct vl_compositor_state *s,
float half_a_line = 0.5f / s->layers[layer].zw.y;
switch(deinterlace) {
case VL_COMPOSITOR_WEAVE:
- s->layers[layer].fs = c->fs_weave_rgb;
+ if (c->pipe_compute_supported)
+ s->layers[layer].cs = c->cs_weave_rgb;
+ else
+ s->layers[layer].fs = c->fs_weave_rgb;
break;
case VL_COMPOSITOR_BOB_TOP:
s->layers[layer].zw.x = 0.0f;
s->layers[layer].src.tl.y += half_a_line;
s->layers[layer].src.br.y += half_a_line;
- s->layers[layer].fs = c->fs_video_buffer;
+ if (c->pipe_compute_supported)
+ s->layers[layer].cs = c->cs_video_buffer;
+ else
+ s->layers[layer].fs = c->fs_video_buffer;
break;
case VL_COMPOSITOR_BOB_BOTTOM:
s->layers[layer].zw.x = 1.0f;
s->layers[layer].src.tl.y -= half_a_line;
s->layers[layer].src.br.y -= half_a_line;
- s->layers[layer].fs = c->fs_video_buffer;
+ if (c->pipe_compute_supported)
+ s->layers[layer].cs = c->cs_video_buffer;
+ else
+ s->layers[layer].fs = c->fs_video_buffer;
break;
}
- } else
- s->layers[layer].fs = c->fs_video_buffer;
+ } else {
+ if (c->pipe_compute_supported)
+ s->layers[layer].cs = c->cs_video_buffer;
+ else
+ s->layers[layer].fs = c->fs_video_buffer;
+ }
}
void
@@ -600,7 +642,10 @@ vl_compositor_set_rgba_layer(struct vl_compositor_state *s,
assert(layer < VL_COMPOSITOR_MAX_LAYERS);
s->used_layers |= 1 << layer;
- s->layers[layer].fs = c->fs_rgba;
+ if (c->pipe_compute_supported)
+ s->layers[layer].cs = c->cs_rgba;
+ else
+ s->layers[layer].fs = c->fs_rgba;
s->layers[layer].samplers[0] = c->sampler_linear;
s->layers[layer].samplers[1] = NULL;
s->layers[layer].samplers[2] = NULL;
@@ -701,7 +746,11 @@ vl_compositor_render(struct vl_compositor_state *s,
bool clear_dirty)
{
assert(s);
- vl_compositor_gfx_render(s, c, dst_surface, dirty_area, clear_dirty);
+
+ if (s->layers->cs)
+ vl_compositor_cs_render(s, c, dst_surface, dirty_area, clear_dirty);
+ else
+ vl_compositor_gfx_render(s, c, dst_surface, dirty_area, clear_dirty);
}
bool
@@ -711,6 +760,7 @@ vl_compositor_init(struct vl_compositor *c, struct pipe_context *pipe)
memset(c, 0, sizeof(*c));
+ c->pipe_compute_supported = pipe->screen->get_param(pipe->screen, PIPE_CAP_COMPUTE);
c->pipe = pipe;
if (!init_pipe_state(c)) {
diff --git a/src/gallium/auxiliary/vl/vl_compositor.h b/src/gallium/auxiliary/vl/vl_compositor.h
index 5fa1b6c..d426188 100644
--- a/src/gallium/auxiliary/vl/vl_compositor.h
+++ b/src/gallium/auxiliary/vl/vl_compositor.h
@@ -117,6 +117,11 @@ struct vl_compositor
void *fs_video_buffer;
void *fs_weave_rgb;
void *fs_rgba;
+ void *cs_video_buffer;
+ void *cs_weave_rgb;
+ void *cs_rgba;
+
+ bool pipe_compute_supported;
struct {
struct {
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev at lists.freedesktop.org<mailto:mesa-dev at lists.freedesktop.org>
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20190214/7aae54e1/attachment-0001.html>
More information about the mesa-dev
mailing list