mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmemorypbo: map/unmap pbo memory correctly for state tracking

Browse source 
Otherwise some downloads will fail to occur from the PBO.
This commit is contained in:
Matthew Waters 2015-12-14 18:18:20 +11:00
parent a07a350183
commit b12f2be4b1
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-libs/gst/gl/gstglmemorypbo.c
View file

@ -317,22 +317,32 @@ _pbo_download_transfer (GstGLMemoryPBO * gl_mem, GstMapInfo * info, gsize size)
{ {
GstMapInfo *pbo_info; GstMapInfo *pbo_info;
gl_mem->pbo->target = GL_PIXEL_PACK_BUFFER;
/* texture -> pbo */ /* texture -> pbo */
if (info->flags & GST_MAP_READ if (info->flags & GST_MAP_READ
&& GST_MEMORY_FLAG_IS_SET (gl_mem, && GST_MEMORY_FLAG_IS_SET (gl_mem,
GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD)) { GST_GL_BASE_MEMORY_TRANSFER_NEED_DOWNLOAD)) {
GstMapInfo info;
GST_CAT_TRACE (GST_CAT_GL_MEMORY, GST_CAT_TRACE (GST_CAT_GL_MEMORY,
"attempting download of texture %u " "using pbo %u", gl_mem->mem.tex_id, "attempting download of texture %u " "using pbo %u", gl_mem->mem.tex_id,
gl_mem->pbo->id); gl_mem->pbo->id);
if (!gst_memory_map (GST_MEMORY_CAST (gl_mem->pbo), &info,
GST_MAP_WRITE | GST_MAP_GL)) {
GST_CAT_WARNING (GST_CAT_GL_MEMORY, "Failed to write to PBO");
return NULL;
}
if (!_read_pixels_to_pbo (gl_mem)) if (!_read_pixels_to_pbo (gl_mem))
return NULL; return NULL;
gst_memory_unmap (GST_MEMORY_CAST (gl_mem->pbo), &info);
} }
pbo_info = g_new0 (GstMapInfo, 1); pbo_info = g_new0 (GstMapInfo, 1);
/* pbo -> data */ /* pbo -> data */
gl_mem->pbo->target = GL_PIXEL_PACK_BUFFER;
/* get a cpu accessible mapping from the pbo */ /* get a cpu accessible mapping from the pbo */
if (!gst_memory_map (GST_MEMORY_CAST (gl_mem->pbo), pbo_info, info->flags)) { if (!gst_memory_map (GST_MEMORY_CAST (gl_mem->pbo), pbo_info, info->flags)) {
GST_CAT_ERROR (GST_CAT_GL_MEMORY, "Failed to map pbo"); GST_CAT_ERROR (GST_CAT_GL_MEMORY, "Failed to map pbo");