diff options
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_context.c | 7 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_video_context.h | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/vdpau/surface.c | 7 | ||||
| -rw-r--r-- | src/gallium/state_trackers/xorg/xvmc/surface.c | 7 |
4 files changed, 6 insertions, 16 deletions
diff --git a/src/gallium/auxiliary/vl/vl_context.c b/src/gallium/auxiliary/vl/vl_context.c index 49a9b50863c..1240b0b4c32 100644 --- a/src/gallium/auxiliary/vl/vl_context.c +++ b/src/gallium/auxiliary/vl/vl_context.c @@ -199,10 +199,15 @@ vl_context_create_decoder(struct pipe_video_context *context, static struct pipe_video_buffer * vl_context_create_buffer(struct pipe_video_context *context, enum pipe_format buffer_format, - const enum pipe_format resource_formats[3], enum pipe_video_chroma_format chroma_format, unsigned width, unsigned height) { + const enum pipe_format resource_formats[3] = { + PIPE_FORMAT_R8_UNORM, + PIPE_FORMAT_R8_UNORM, + PIPE_FORMAT_R8_UNORM + }; + struct vl_context *ctx = (struct vl_context*)context; struct pipe_video_buffer *result; unsigned buffer_width, buffer_height; diff --git a/src/gallium/include/pipe/p_video_context.h b/src/gallium/include/pipe/p_video_context.h index 8775bbb2705..7e971641618 100644 --- a/src/gallium/include/pipe/p_video_context.h +++ b/src/gallium/include/pipe/p_video_context.h @@ -121,7 +121,6 @@ struct pipe_video_context */ struct pipe_video_buffer *(*create_buffer)(struct pipe_video_context *context, enum pipe_format buffer_format, - const enum pipe_format resource_formats[3], enum pipe_video_chroma_format chroma_format, unsigned width, unsigned height); diff --git a/src/gallium/state_trackers/vdpau/surface.c b/src/gallium/state_trackers/vdpau/surface.c index 57f5563b12f..cd2125fce63 100644 --- a/src/gallium/state_trackers/vdpau/surface.c +++ b/src/gallium/state_trackers/vdpau/surface.c @@ -41,12 +41,6 @@ vlVdpVideoSurfaceCreate(VdpDevice device, VdpChromaType chroma_type, uint32_t width, uint32_t height, VdpVideoSurface *surface) { - const enum pipe_format resource_formats[3] = { - PIPE_FORMAT_R8_UNORM, - PIPE_FORMAT_R8_UNORM, - PIPE_FORMAT_R8_UNORM - }; - vlVdpSurface *p_surf; VdpStatus ret; @@ -77,7 +71,6 @@ vlVdpVideoSurfaceCreate(VdpDevice device, VdpChromaType chroma_type, p_surf->device = dev; p_surf->video_buffer = dev->context->vpipe->create_buffer(dev->context->vpipe, PIPE_FORMAT_YV12, // most common used - resource_formats, ChromaToPipe(chroma_type), width, height); diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c index f8a0f3c7fd9..7429fdfcfb9 100644 --- a/src/gallium/state_trackers/xorg/xvmc/surface.c +++ b/src/gallium/state_trackers/xorg/xvmc/surface.c @@ -284,12 +284,6 @@ unmap_and_flush_surface(XvMCSurfacePrivate *surface) PUBLIC Status XvMCCreateSurface(Display *dpy, XvMCContext *context, XvMCSurface *surface) { - const enum pipe_format resource_formats[3] = { - PIPE_FORMAT_R8_SNORM, - PIPE_FORMAT_R8_SNORM, - PIPE_FORMAT_R8_SNORM - }; - XvMCContextPrivate *context_priv; struct pipe_video_context *vpipe; XvMCSurfacePrivate *surface_priv; @@ -313,7 +307,6 @@ Status XvMCCreateSurface(Display *dpy, XvMCContext *context, XvMCSurface *surfac surface_priv->decode_buffer = context_priv->decoder->create_buffer(context_priv->decoder); surface_priv->mv_stride = surface_priv->decode_buffer->get_mv_stream_stride(surface_priv->decode_buffer); surface_priv->video_buffer = vpipe->create_buffer(vpipe, PIPE_FORMAT_YV12, //TODO - resource_formats, context_priv->decoder->chroma_format, context_priv->decoder->width, context_priv->decoder->height); |