progress, not crashing anymore, just a black screen

Author: gabriel pettier

kivy/graphics/c_opengl.pxd

@@ -367,6 +367,7 @@ cdef extern from "gl_redirect.h":
     int GL_MAX_RENDERBUFFER_SIZE
 
     int GL_INVALID_FRAMEBUFFER_OPERATION
+    int GL_PIXEL_UNPACK_BUFFER
 
     IF USE_OPENGL_ES2:
         int GL_FIXED
@@ -528,3 +529,5 @@ cdef extern from "gl_redirect.h":
     cdef void  glVertexAttrib4fv(GLuint indx,  GLfloat* values) nogil
     cdef void  glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride,  GLvoid* ptr) nogil
     cdef void  glViewport(GLint x, GLint y, GLsizei width, GLsizei height) nogil
+    cdef void *glMapBuffer(GLenum target, GLbitfield access) nogil
+    cdef GLboolean  glUnmapBuffer(GLenum target) nogil

kivy/graphics/gl_redirect.h

@@ -23,6 +23,7 @@
 #	define GL_SHADER_BINARY_FORMATS					0x8DF8
 #	define GL_RGB565								0x8D62
 #	define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 	0x8CD9
+#       define GL_PIXEL_UNPACK_BUFFER 0x88EC
 #else
 #	if __USE_OPENGL_ES2
 #		if __APPLE__

kivy/graphics/opengl.pyx

@@ -338,6 +338,7 @@ GL_FRAMEBUFFER_BINDING = c_opengl.GL_FRAMEBUFFER_BINDING
 GL_RENDERBUFFER_BINDING = c_opengl.GL_RENDERBUFFER_BINDING
 GL_MAX_RENDERBUFFER_SIZE = c_opengl.GL_MAX_RENDERBUFFER_SIZE
 GL_INVALID_FRAMEBUFFER_OPERATION = c_opengl.GL_INVALID_FRAMEBUFFER_OPERATION
+GL_PIXEL_UNPACK_BUFFER = c_opengl.GL_PIXEL_UNPACK_BUFFER
 
 # not working with GL standard include
 GL_SHADER_BINARY_FORMATS = c_opengl.GL_SHADER_BINARY_FORMATS
@@ -777,6 +778,15 @@ def glGenBuffers(GLsizei n):
     c_opengl.glGenBuffers(n, d)
     return _genEnd(n, d)
 
+
+#def glMapBuffer(GLenum target, GLbitfield access):
+#    return c_opengl.glMapBuffer(target, access)
+
+
+#def glUnmapBuffer(GLenum target):
+#    return c_opengl.glUnmapBuffer(target)
+
+
 def glGenerateMipmap(GLenum target):
     '''See: `glGenerateMipmap() on Kronos website
     <http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGenerateMipmap.xml>`_

kivy/graphics/pbo.pxd

@@ -0,0 +1,11 @@
+from c_opengl cimport GLuint
+
+cdef class PBO:
+    cdef object __weakref__
+    cdef GLuint _id
+    cdef int width
+    cdef int height
+    cdef int data_size
+
+    cdef void release(self)
+    cpdef GLuint get_id(self)

kivy/graphics/pbo.pyx

@@ -0,0 +1,41 @@
+include "config.pxi"
+include "common.pxi"
+include "gl_debug_logger.pxi"
+
+from kivy.graphics.c_opengl cimport *
+IF USE_OPENGL_DEBUG == 1:
+    from kivy.graphics.c_opengl_debug cimport *
+
+class PBOException(Exception):
+    pass
+
+
+# cdef pbo_update(int _id, int data_size, char *target) nogil:
+#     cdef char *ptr
+#     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _id)
+#     ptr = glMapBuffers(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY)
+#     if ptr:
+#         memcpy(ptr, target, data_size * pixel_size)
+#         glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)
+#     else:
+#         raise PBOException('unable to map PBO buffer')
+#     glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)
+#
+
+cdef class PBO:
+    def __init__(self, width, height):
+        cdef int data_size = width * height
+        self.width = width
+        self.height = height
+        glGenBuffers(1, &self._id)
+
+        if self._id <= 0:
+            raise PBOException('invalid glGenBuffers result')
+
+
+    cdef void release(self):
+        glDeleteBuffers(1, &self._id)
+
+    cpdef GLuint get_id(self):
+        #print "get_id called", self._id
+        return self._id

kivy/graphics/texture.pxd

@@ -27,6 +27,7 @@ cdef class Texture:
     cdef list observers
     cdef object _proxyimage
     cdef object _callback
+    cdef object _pbo
 
     cdef void update_tex_coords(self)
     cdef void set_min_filter(self, x)

kivy/graphics/texture.pyx

@@ -225,12 +225,15 @@ include "opengl_utils_def.pxi"
 include "img_tools.pxi"
 include "gl_debug_logger.pxi"
 
+#from libc.stdio cimport puts, printf
 cimport cython
 from os import environ
 from kivy.utils import platform
 from kivy.weakmethod import WeakMethod
 from kivy.graphics.context cimport get_context
 
+from kivy.graphics.pbo import PBO
+
 from kivy.graphics.c_opengl cimport *
 IF USE_OPENGL_DEBUG == 1:
     from kivy.graphics.c_opengl_debug cimport *
@@ -277,6 +280,9 @@ DEF GL_UNPACK_ROW_LENGTH = 0x0CF2
 DEF GL_UNPACK_SKIP_ROWS = 0x0CF3
 DEF GL_UNPACK_SKIP_PIXELS = 0x0CF4
 
+DEF GL_PIXEL_UNPACK_BUFFER = 0x88EC
+DEF GL_WRITE_ONLY = 0x88B9
+
 cdef dict _gl_color_fmt = {
     'rgba': GL_RGBA, 'bgra': GL_BGRA, 'rgb': GL_RGB, 'bgr': GL_BGR,
     'luminance': GL_LUMINANCE, 'luminance_alpha': GL_LUMINANCE_ALPHA,
@@ -638,6 +644,7 @@ cdef class Texture:
         self._source        = source
         self._nofree        = 0
         self._callback      = callback
+        self._pbo           = None
 
         if texid == 0:
             self.flags |= TI_NEED_GEN
@@ -647,6 +654,14 @@ cdef class Texture:
         self.update_tex_coords()
         get_context().register_texture(self)
 
+
+        if (
+            gl_has_extension('ARB_pixel_buffer_object') or
+            gl_has_extension('EXT_pixel_buffer_object')
+        ):
+            # gl_has_extension('GL_OES_mapbuffer')
+            self._pbo = pbo = PBO(width, height)
+
     def __dealloc__(self):
         get_context().dealloc_texture(self)
 
@@ -971,6 +986,11 @@ cdef class Texture:
         cdef int i
         cdef int require_subimage = 0
 
+        cdef GLuint pbo = 0
+        cdef void *ptr
+        if self._pbo:
+            pbo = self._pbo.get_id()
+
         # if the hardware doesn't support native unpack, use alternative method.
         if need_unpack and not gl_has_capability(GLCAP_UNPACK_SUBIMAGE):
             require_subimage = 1
@@ -1006,12 +1026,49 @@ cdef class Texture:
                 glCompressedTexImage2D(target, _mipmap_level, glfmt, w, h, 0,
                         <GLsizei>datasize, cdata)
             elif is_allocated:
-                glTexSubImage2D(target, _mipmap_level, x, y, w, h, glfmt,
-                    glbufferfmt, cdata)
+                if pbo:
+                    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo)
+                    ptr = glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY)
+                    if ptr:
+                        memcpy(ptr, cdata, datasize)
+                        glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)
+                    else:
+                        pass
+                        #raise PBOException('unable to map PBO buffer')
+                    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)
+                    #pbo_update(pbo, datasize, cdata)  XXX
+
+                else:
+                    glTexSubImage2D(target, _mipmap_level, x, y, w, h, glfmt,
+                        glbufferfmt, cdata)
             else:
-                glTexImage2D(target, _mipmap_level, iglfmt, w, h, 0, glfmt,
-                    glbufferfmt, cdata)
-                
+                if pbo:
+                    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo)
+                    #print glIsBuffer(pbo) == GL_TRUE
+
+                    # XXX STREAM may not be the best choice, for example for videos,
+                    # DYNAMIC may be better, allow to pick the PBO type?
+                    glBufferData(GL_PIXEL_UNPACK_BUFFER, datasize, <GLvoid*> 0, GL_STREAM_DRAW)
+                    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)
+
+                    #puts("bind buffer")
+                    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo)
+                    #puts("map buffer")
+                    ptr = glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY)
+                    if ptr:
+                        #puts("memcpy")
+                        memcpy(ptr, cdata, datasize)
+                        #puts("unmap")
+                        glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)
+                    else:
+                        pass
+                        # raise PBOException('unable to map PBO buffer')
+                    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)
+                    # pbo_update(pbo, datasize, cdata) XXX
+                else:
+                    glTexImage2D(target, _mipmap_level, iglfmt, w, h, 0, glfmt,
+                                glbufferfmt, cdata)
+
             if _mipmap_generation:
                 glGenerateMipmap(target)
 

setup.py

@@ -613,6 +613,7 @@ def determine_sdl2():
     'fbo.pyx': [
         'config.pxi', 'opcodes.pxi', 'transformation.pxd', 'context.pxd',
         'c_opengl_debug.pxd'],
+    'pbo.pyx': ['c_opengl.pxd'],
     'gl_instructions.pyx': [
         'config.pxi', 'opcodes.pxi', 'c_opengl.pxd', 'c_opengl_debug.pxd',
         'instructions.pxd'],
@@ -640,7 +641,7 @@ def determine_sdl2():
     'texture.pyx': [
         'config.pxi', 'common.pxi', 'opengl_utils_def.pxi', 'context.pxd',
         'c_opengl.pxd', 'c_opengl_debug.pxd', 'opengl_utils.pxd',
-        'img_tools.pxi'],
+        'img_tools.pxi', 'pbo.pyx'],
     'vbo.pxd': ['buffer.pxd', 'c_opengl.pxd', 'vertex.pxd'],
     'vbo.pyx': [
         'config.pxi', 'common.pxi', 'c_opengl_debug.pxd', 'context.pxd',
@@ -674,6 +675,7 @@ def determine_sdl2():
     'graphics/texture.pyx': merge(base_flags, gl_flags),
     'graphics/transformation.pyx': merge(base_flags, gl_flags),
     'graphics/vbo.pyx': merge(base_flags, gl_flags),
+    'graphics/pbo.pyx': merge(base_flags, gl_flags),
     'graphics/vertex.pyx': merge(base_flags, gl_flags),
     'graphics/vertex_instructions.pyx': merge(base_flags, gl_flags),
     'core/text/text_layout.pyx': base_flags,