Re: [Mesa-dev] [PATCH 3/3] st/va: add RGB support to vlVaPutSurface

2017-10-03 Thread Christian König
Reviewed-by: Christian König  for the whole 
series.


Regards,
Christian.

Am 02.10.2017 um 18:53 schrieb Andy Furniss:

Tested-by: Andy Furniss 

Leo Liu wrote:

---
  src/gallium/state_trackers/va/surface.c | 14 +-
  1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/va/surface.c 
b/src/gallium/state_trackers/va/surface.c

index 643cdcd54a..4c2f4b5452 100644
--- a/src/gallium/state_trackers/va/surface.c
+++ b/src/gallium/state_trackers/va/surface.c
@@ -280,6 +280,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID 
surface_id, void* draw, short s

 struct vl_screen *vscreen;
 struct u_rect src_rect, *dirty_area;
 struct u_rect dst_rect = {destx, destx + destw, desty, desty + 
desth};

+   enum pipe_format format;
 VAStatus status;
   if (!ctx)
@@ -318,8 +319,19 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID 
surface_id, void* draw, short s

 src_rect.x1 = srcw + srcx;
 src_rect.y1 = srch + srcy;
  +   format = surf->buffer->buffer_format;
+
 vl_compositor_clear_layers(>cstate);
-   vl_compositor_set_buffer_layer(>cstate, >compositor, 0, 
surf->buffer, _rect, NULL, VL_COMPOSITOR_WEAVE);

+
+   if (format == PIPE_FORMAT_B8G8R8A8_UNORM || format == 
PIPE_FORMAT_B8G8R8X8_UNORM ||
+   format == PIPE_FORMAT_R8G8B8A8_UNORM || format == 
PIPE_FORMAT_R8G8B8X8_UNORM) {

+  struct pipe_sampler_view **views;
+
+  views = surf->buffer->get_sampler_view_planes(surf->buffer);
+  vl_compositor_set_rgba_layer(>cstate, >compositor, 
0, views[0], _rect, NULL, NULL);

+   } else
+  vl_compositor_set_buffer_layer(>cstate, >compositor, 
0, surf->buffer, _rect, NULL, VL_COMPOSITOR_WEAVE);

+
 vl_compositor_set_layer_dst_area(>cstate, 0, _rect);
 vl_compositor_render(>cstate, >compositor, surf_draw, 
dirty_area, true);




___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev



___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH 3/3] st/va: add RGB support to vlVaPutSurface

2017-10-02 Thread Andy Furniss

Tested-by: Andy Furniss 

Leo Liu wrote:

---
  src/gallium/state_trackers/va/surface.c | 14 +-
  1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/va/surface.c 
b/src/gallium/state_trackers/va/surface.c
index 643cdcd54a..4c2f4b5452 100644
--- a/src/gallium/state_trackers/va/surface.c
+++ b/src/gallium/state_trackers/va/surface.c
@@ -280,6 +280,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID 
surface_id, void* draw, short s
 struct vl_screen *vscreen;
 struct u_rect src_rect, *dirty_area;
 struct u_rect dst_rect = {destx, destx + destw, desty, desty + desth};
+   enum pipe_format format;
 VAStatus status;
  
 if (!ctx)

@@ -318,8 +319,19 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID 
surface_id, void* draw, short s
 src_rect.x1 = srcw + srcx;
 src_rect.y1 = srch + srcy;
  
+   format = surf->buffer->buffer_format;

+
 vl_compositor_clear_layers(>cstate);
-   vl_compositor_set_buffer_layer(>cstate, >compositor, 0, surf->buffer, 
_rect, NULL, VL_COMPOSITOR_WEAVE);
+
+   if (format == PIPE_FORMAT_B8G8R8A8_UNORM || format == 
PIPE_FORMAT_B8G8R8X8_UNORM ||
+   format == PIPE_FORMAT_R8G8B8A8_UNORM || format == 
PIPE_FORMAT_R8G8B8X8_UNORM) {
+  struct pipe_sampler_view **views;
+
+  views = surf->buffer->get_sampler_view_planes(surf->buffer);
+  vl_compositor_set_rgba_layer(>cstate, >compositor, 0, views[0], 
_rect, NULL, NULL);
+   } else
+  vl_compositor_set_buffer_layer(>cstate, >compositor, 0, 
surf->buffer, _rect, NULL, VL_COMPOSITOR_WEAVE);
+
 vl_compositor_set_layer_dst_area(>cstate, 0, _rect);
 vl_compositor_render(>cstate, >compositor, surf_draw, 
dirty_area, true);
  



___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 3/3] st/va: add RGB support to vlVaPutSurface

2017-10-01 Thread Leo Liu
---
 src/gallium/state_trackers/va/surface.c | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/va/surface.c 
b/src/gallium/state_trackers/va/surface.c
index 643cdcd54a..4c2f4b5452 100644
--- a/src/gallium/state_trackers/va/surface.c
+++ b/src/gallium/state_trackers/va/surface.c
@@ -280,6 +280,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID 
surface_id, void* draw, short s
struct vl_screen *vscreen;
struct u_rect src_rect, *dirty_area;
struct u_rect dst_rect = {destx, destx + destw, desty, desty + desth};
+   enum pipe_format format;
VAStatus status;
 
if (!ctx)
@@ -318,8 +319,19 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID 
surface_id, void* draw, short s
src_rect.x1 = srcw + srcx;
src_rect.y1 = srch + srcy;
 
+   format = surf->buffer->buffer_format;
+
vl_compositor_clear_layers(>cstate);
-   vl_compositor_set_buffer_layer(>cstate, >compositor, 0, 
surf->buffer, _rect, NULL, VL_COMPOSITOR_WEAVE);
+
+   if (format == PIPE_FORMAT_B8G8R8A8_UNORM || format == 
PIPE_FORMAT_B8G8R8X8_UNORM ||
+   format == PIPE_FORMAT_R8G8B8A8_UNORM || format == 
PIPE_FORMAT_R8G8B8X8_UNORM) {
+  struct pipe_sampler_view **views;
+
+  views = surf->buffer->get_sampler_view_planes(surf->buffer);
+  vl_compositor_set_rgba_layer(>cstate, >compositor, 0, 
views[0], _rect, NULL, NULL);
+   } else
+  vl_compositor_set_buffer_layer(>cstate, >compositor, 0, 
surf->buffer, _rect, NULL, VL_COMPOSITOR_WEAVE);
+
vl_compositor_set_layer_dst_area(>cstate, 0, _rect);
vl_compositor_render(>cstate, >compositor, surf_draw, dirty_area, 
true);
 
-- 
2.11.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev