summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_vdpau.c181
1 files changed, 132 insertions, 49 deletions
diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c
index 71dd15bc4fe..b9abebfc7bf 100644
--- a/src/mesa/state_tracker/st_vdpau.c
+++ b/src/mesa/state_tracker/st_vdpau.c
@@ -39,8 +39,6 @@
#include "pipe/p_state.h"
#include "pipe/p_video_codec.h"
-#include "state_tracker/vdpau_interop.h"
-
#include "util/u_inlines.h"
#include "st_vdpau.h"
@@ -51,70 +49,155 @@
#ifdef HAVE_ST_VDPAU
+#include "state_tracker/vdpau_interop.h"
+#include "state_tracker/vdpau_dmabuf.h"
+#include "state_tracker/vdpau_funcs.h"
+#include "state_tracker/drm_driver.h"
+
+static struct pipe_resource *
+st_vdpau_video_surface_gallium(struct gl_context *ctx, const GLvoid *vdpSurface,
+ GLuint index)
+{
+ int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
+ uint32_t device = (uintptr_t)ctx->vdpDevice;
+ struct pipe_sampler_view *sv;
+ VdpVideoSurfaceGallium *f;
+
+ struct pipe_video_buffer *buffer;
+ struct pipe_sampler_view **samplers;
+
+ getProcAddr = (void *)ctx->vdpGetProcAddress;
+ if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM, (void**)&f))
+ return NULL;
+
+ buffer = f((uintptr_t)vdpSurface);
+ if (!buffer)
+ return NULL;
+
+ samplers = buffer->get_sampler_view_planes(buffer);
+ if (!samplers)
+ return NULL;
+
+ sv = samplers[index >> 1];
+ if (!sv)
+ return NULL;
+
+ return sv->texture;
+}
+
+static struct pipe_resource *
+st_vdpau_output_surface_gallium(struct gl_context *ctx, const GLvoid *vdpSurface)
+{
+ int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
+ uint32_t device = (uintptr_t)ctx->vdpDevice;
+ VdpOutputSurfaceGallium *f;
+
+ getProcAddr = (void *)ctx->vdpGetProcAddress;
+ if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM, (void**)&f))
+ return NULL;
+
+ return f((uintptr_t)vdpSurface);
+}
+
+static struct pipe_resource *
+st_vdpau_resource_from_description(struct gl_context *ctx,
+ const struct VdpSurfaceDMABufDesc *desc)
+{
+ struct st_context *st = st_context(ctx);
+ struct pipe_resource templ, *res;
+ struct winsys_handle whandle;
+
+ if (desc->handle == -1)
+ return NULL;
+
+ memset(&templ, 0, sizeof(templ));
+ templ.target = PIPE_TEXTURE_2D;
+ templ.last_level = 0;
+ templ.depth0 = 1;
+ templ.array_size = 1;
+ templ.width0 = desc->width;
+ templ.height0 = desc->height;
+ templ.format = VdpFormatRGBAToPipe(desc->format);
+ templ.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
+ templ.usage = PIPE_USAGE_DEFAULT;
+
+ memset(&whandle, 0, sizeof(whandle));
+ whandle.type = DRM_API_HANDLE_TYPE_FD;
+ whandle.handle = desc->handle;
+ whandle.offset = desc->offset;
+ whandle.stride = desc->stride;
+
+ res = st->pipe->screen->resource_from_handle(st->pipe->screen, &templ, &whandle,
+ PIPE_HANDLE_USAGE_READ_WRITE);
+ close(desc->handle);
+
+ return res;
+}
+
+static struct pipe_resource *
+st_vdpau_output_surface_dma_buf(struct gl_context *ctx, const GLvoid *vdpSurface)
+{
+ int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
+ uint32_t device = (uintptr_t)ctx->vdpDevice;
+
+ struct VdpSurfaceDMABufDesc desc;
+ VdpOutputSurfaceDMABuf *f;
+
+ getProcAddr = (void *)ctx->vdpGetProcAddress;
+ if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_DMA_BUF, (void**)&f))
+ return NULL;
+
+ if (f((uintptr_t)vdpSurface, &desc) != VDP_STATUS_OK)
+ return NULL;
+
+ return st_vdpau_resource_from_description(ctx, &desc);
+}
+
+static struct pipe_resource *
+st_vdpau_video_surface_dma_buf(struct gl_context *ctx, const GLvoid *vdpSurface,
+ GLuint index)
+{
+ int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
+ uint32_t device = (uintptr_t)ctx->vdpDevice;
+
+ struct VdpSurfaceDMABufDesc desc;
+ VdpVideoSurfaceDMABuf *f;
+
+ getProcAddr = (void *)ctx->vdpGetProcAddress;
+ if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_DMA_BUF, (void**)&f))
+ return NULL;
+
+ if (f((uintptr_t)vdpSurface, index, &desc) != VDP_STATUS_OK)
+ return NULL;
+
+ return st_vdpau_resource_from_description(ctx, &desc);
+}
+
static void
st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access,
GLboolean output, struct gl_texture_object *texObj,
struct gl_texture_image *texImage,
const GLvoid *vdpSurface, GLuint index)
{
- int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
- uint32_t device = (uintptr_t)ctx->vdpDevice;
-
struct st_context *st = st_context(ctx);
struct st_texture_object *stObj = st_texture_object(texObj);
struct st_texture_image *stImage = st_texture_image(texImage);
-
+
struct pipe_resource *res;
struct pipe_sampler_view templ, **sampler_view;
mesa_format texFormat;
- getProcAddr = (void *)ctx->vdpGetProcAddress;
if (output) {
- VdpOutputSurfaceGallium *f;
-
- if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM, (void**)&f)) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
- return;
- }
-
- res = f((uintptr_t)vdpSurface);
+ res = st_vdpau_output_surface_dma_buf(ctx, vdpSurface);
- if (!res) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
- return;
- }
+ if (!res)
+ res = st_vdpau_output_surface_gallium(ctx, vdpSurface);
} else {
- struct pipe_sampler_view *sv;
- VdpVideoSurfaceGallium *f;
-
- struct pipe_video_buffer *buffer;
- struct pipe_sampler_view **samplers;
-
- if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM, (void**)&f)) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
- return;
- }
-
- buffer = f((uintptr_t)vdpSurface);
- if (!buffer) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
- return;
- }
-
- samplers = buffer->get_sampler_view_planes(buffer);
- if (!samplers) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
- return;
- }
-
- sv = samplers[index >> 1];
- if (!sv) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
- return;
- }
-
- res = sv->texture;
+ res = st_vdpau_video_surface_dma_buf(ctx, vdpSurface, index);
+
+ if (!res)
+ res = st_vdpau_video_surface_gallium(ctx, vdpSurface, index);
}
if (!res) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 08:43:02 +0000