diff pytouhou/ui/opengl/framebuffer.pxd @ 610:1b31169dc344

Move the passthrough shader to the Framebuffer class, since it isn’t used in the use_framebuffer_blit path.
author Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date Sun, 21 Dec 2014 18:52:18 +0100
parents 6c9d8a3d853f
children a6af3ff86612
line wrap: on
line diff
--- a/pytouhou/ui/opengl/framebuffer.pxd
+++ b/pytouhou/ui/opengl/framebuffer.pxd
@@ -1,4 +1,6 @@
 from pytouhou.lib.opengl cimport GLuint
+from pytouhou.utils.matrix cimport Matrix
+from .shader cimport Shader
 
 cdef struct PassthroughVertex:
     short x, y
@@ -6,10 +8,17 @@ cdef struct PassthroughVertex:
 
 
 cdef class Framebuffer:
-    cdef GLuint fbo, texture, rbo, vbo, vao
+    cdef GLuint fbo, texture, rbo
+
+    # Used by the use_framebuffer_blit path
+    cdef int x, y, width, height
+
+    # Used by the other one.
+    cdef GLuint vbo, vao
+    cdef Shader shader
+    cdef Matrix *mvp
     cdef PassthroughVertex[4] buf
-    cdef int x, y, width, height
 
     cpdef bind(self)
     cdef void set_state(self) nogil
-    cdef void render(self, int x, int y, int width, int height) nogil
+    cdef void render(self, int x, int y, int width, int height) except *