gallium/auxiliary/vl: add compute shaders for deint yuv

[mesa.git] / src / gallium / auxiliary / vl / vl_compositor.c

diff --git a/src/gallium/auxiliary/vl/vl_compositor.c b/src/gallium/auxiliary/vl/vl_compositor.c
index 54a3a21d2cbd944a6f5feec61e2855e71aa8f62f..04808e80d84e525022971d786ff487b1ab204c08 100644 (file)
--- a/src/gallium/auxiliary/vl/vl_compositor.c
+++ b/src/gallium/auxiliary/vl/vl_compositor.c
@@ -36,17 +36,9 @@ init_shaders(struct vl_compositor *c)
    assert(c);
 
    if (c->pipe_cs_composit_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");
+      if (!vl_compositor_cs_init_shaders(c))
          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;
-      }
    } else if (c->pipe_gfx_supported) {
       c->fs_video_buffer = create_frag_shader_video_buffer(c);
       if (!c->fs_video_buffer) {
@@ -59,24 +51,24 @@ init_shaders(struct vl_compositor *c)
          debug_printf("Unable to create YCbCr-to-RGB weave fragment shader.\n");
          return false;
       }
-   }
-
-   if (c->pipe_gfx_supported) {
-      c->vs = create_vert_shader(c);
-      if (!c->vs) {
-         debug_printf("Unable to create vertex 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);
       c->fs_yuv.bob.uv = create_frag_shader_deint_yuv(c, false, false);
       if (!c->fs_yuv.weave.y || !c->fs_yuv.weave.uv ||
-      !c->fs_yuv.bob.y || !c->fs_yuv.bob.uv) {
+          !c->fs_yuv.bob.y || !c->fs_yuv.bob.uv) {
          debug_printf("Unable to create YCbCr i-to-YCbCr p deint fragment shader.\n");
          return false;
       }
+   }
+
+   if (c->pipe_gfx_supported) {
+      c->vs = create_vert_shader(c);
+      if (!c->vs) {
+         debug_printf("Unable to create vertex shader.\n");
+         return false;
+      }
 
       c->fs_palette.yuv = create_frag_shader_palette(c, true);
       if (!c->fs_palette.yuv) {
@@ -112,19 +104,18 @@ static void cleanup_shaders(struct vl_compositor *c)
    assert(c);
 
    if (c->pipe_cs_composit_supported) {
-      c->pipe->delete_compute_state(c->pipe, c->cs_video_buffer);
-      c->pipe->delete_compute_state(c->pipe, c->cs_weave_rgb);
+      vl_compositor_cs_cleanup_shaders(c);
    } else if (c->pipe_gfx_supported) {
       c->pipe->delete_fs_state(c->pipe, c->fs_video_buffer);
       c->pipe->delete_fs_state(c->pipe, c->fs_weave_rgb);
-   }
-
-   if (c->pipe_gfx_supported) {
-      c->pipe->delete_vs_state(c->pipe, c->vs);
       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);
+   }
+
+   if (c->pipe_gfx_supported) {
+      c->pipe->delete_vs_state(c->pipe, c->vs);
       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_rgb_yuv.y);
@@ -355,18 +346,27 @@ set_yuv_layer(struct vl_compositor_state *s, struct vl_compositor *c,
       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 = (y) ? c->fs_yuv.bob.y : c->fs_yuv.bob.uv;
+      if (c->pipe_gfx_supported)
+          s->layers[layer].fs = (y) ? c->fs_yuv.bob.y : c->fs_yuv.bob.uv;
+      if (c->pipe_cs_composit_supported)
+          s->layers[layer].cs = (y) ? c->cs_yuv.bob.y : c->cs_yuv.bob.uv;
       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 = (y) ? c->fs_yuv.bob.y : c->fs_yuv.bob.uv;
+      if (c->pipe_gfx_supported)
+          s->layers[layer].fs = (y) ? c->fs_yuv.bob.y : c->fs_yuv.bob.uv;
+      if (c->pipe_cs_composit_supported)
+          s->layers[layer].cs = (y) ? c->cs_yuv.bob.y : c->cs_yuv.bob.uv;
       break;
 
    default:
-      s->layers[layer].fs = (y) ? c->fs_yuv.weave.y : c->fs_yuv.weave.uv;
+      if (c->pipe_gfx_supported)
+          s->layers[layer].fs = (y) ? c->fs_yuv.weave.y : c->fs_yuv.weave.uv;
+      if (c->pipe_cs_composit_supported)
+          s->layers[layer].cs = (y) ? c->cs_yuv.weave.y : c->cs_yuv.weave.uv;
       break;
    }
 }