From 5d0d2ec6ca9e66e853fc4a419a8b64a28333f1cb Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Mon, 14 Dec 2015 18:19:37 +1100 Subject: [PATCH] glbuffer: remove buffer specific transfer flags Instead rely on GstGLBaseMemory's transfer handling --- gst-libs/gst/gl/gstglbuffer.c | 4 ++-- gst-libs/gst/gl/gstglbuffer.h | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/gst-libs/gst/gl/gstglbuffer.c b/gst-libs/gst/gl/gstglbuffer.c index f7b244b..32305c5 100644 --- a/gst-libs/gst/gl/gstglbuffer.c +++ b/gst-libs/gst/gl/gstglbuffer.c @@ -131,7 +131,7 @@ gst_gl_buffer_cpu_access (GstGLBuffer * mem, GstMapInfo * info, gsize size) /* The extra data pointer indirection/memcpy is needed for coherent across * concurrent map()'s in both GL and CPU */ - if (GST_MEMORY_FLAG_IS_SET (mem, GST_GL_BUFFER_FLAG_NEED_DOWNLOAD) + if (GST_MEMORY_FLAG_IS_SET (mem, GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD) && (info->flags & GST_MAP_GL) == 0 && (info->flags & GST_MAP_READ) != 0) { gl->BindBuffer (mem->target, mem->id); @@ -175,7 +175,7 @@ gst_gl_buffer_upload_cpu_write (GstGLBuffer * mem, GstMapInfo * info, * concurrent map()'s in both GL and CPU */ /* FIXME: uploading potentially half-written data for libav pushing READWRITE * mapped buffers */ - if (GST_MEMORY_FLAG_IS_SET (mem, GST_GL_BUFFER_FLAG_NEED_UPLOAD) + if (GST_MEMORY_FLAG_IS_SET (mem, GST_GL_BASE_MEMORY_TRANSFER_NEED_UPLOAD) || (mem->mem.map_flags & GST_MAP_WRITE) != 0) { gl->BindBuffer (mem->target, mem->id); diff --git a/gst-libs/gst/gl/gstglbuffer.h b/gst-libs/gst/gl/gstglbuffer.h index a88a73b..313cb69 100644 --- a/gst-libs/gst/gl/gstglbuffer.h +++ b/gst-libs/gst/gl/gstglbuffer.h @@ -39,24 +39,6 @@ GType gst_gl_buffer_allocator_get_type(void); #define GST_GL_BUFFER_ALLOCATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_GL_BUFFER_ALLOCATOR, GstGLBufferAllocatorClass)) #define GST_GL_BUFFER_ALLOCATOR_CAST(obj) ((GstGLBufferAllocator *)(obj)) - -typedef enum -{ - GST_GL_BUFFER_FLAG_NEED_DOWNLOAD = (GST_MEMORY_FLAG_LAST << 0), - GST_GL_BUFFER_FLAG_NEED_UPLOAD = (GST_MEMORY_FLAG_LAST << 1) -} GstGLBufferFlags; - -/** - * GST_MAP_GL: - * - * Flag indicating that we should map the GL object instead of to system memory. - * - * Combining #GST_MAP_GL with #GST_MAP_WRITE has the same semantics as though - * you are writing to OpenGL. Conversely, combining #GST_MAP_GL with - * #GST_MAP_READ has the same semantics as though you are reading from OpenGL. - */ -#define GST_MAP_GL (GST_MAP_FLAG_LAST << 1) - /** * GstGLBuffer: * @mem: the parent object -- 2.7.4