Preload ShapeElementList program

pvcraven · Apr 8, 2020 · 2aa7ae9 · 2aa7ae9
1 parent 00e32b6
commit 2aa7ae9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 30 deletions.
diff --git a/arcade/buffered_draw_commands.py b/arcade/buffered_draw_commands.py
@@ -577,36 +577,7 @@ def __init__(self):
         self._center_x = 0
         self._center_y = 0
         self._angle = 0
-        self.program = self.ctx.program(
-            vertex_shader='''
-                #version 330
-                uniform mat4 Projection;
-                uniform vec2 Position;
-                uniform float Angle;
-
-                in vec2 in_vert;
-                in vec4 in_color;
-
-                out vec4 v_color;
-                void main() {
-                    float angle = radians(Angle);
-                    mat2 rotate = mat2(
-                        cos(angle), sin(angle),
-                        -sin(angle), cos(angle)
-                    );
-                   gl_Position = Projection * vec4(Position + (rotate * in_vert), 0.0, 1.0);
-                   v_color = in_color;
-                }
-            ''',
-            fragment_shader='''
-                #version 330
-                in vec4 v_color;
-                out vec4 f_color;
-                void main() {
-                    f_color = v_color;
-                }
-            ''',
-        )
+        self.program = self.ctx.shape_element_list_program
         # Could do much better using just one vbo and glDrawElementsBaseVertex
         self.batches = defaultdict(_Batch)
         self.dirties = set()

diff --git a/arcade/resources/shaders/shape_element_list_fs.glsl b/arcade/resources/shaders/shape_element_list_fs.glsl
@@ -0,0 +1,8 @@
+#version 330
+
+in vec4 v_color;
+out vec4 f_color;
+
+void main() {
+    f_color = v_color;
+}
diff --git a/arcade/resources/shaders/shape_element_list_vs.glsl b/arcade/resources/shaders/shape_element_list_vs.glsl
@@ -0,0 +1,20 @@
+#version 330
+
+uniform mat4 Projection;
+uniform vec2 Position;
+uniform float Angle;
+
+in vec2 in_vert;
+in vec4 in_color;
+
+out vec4 v_color;
+
+void main() {
+    float angle = radians(Angle);
+    mat2 rotate = mat2(
+        cos(angle), sin(angle),
+        -sin(angle), cos(angle)
+    );
+    gl_Position = Projection * vec4(Position + (rotate * in_vert), 0.0, 1.0);
+    v_color = in_color;
+}
diff --git a/arcade/shader.py b/arcade/shader.py
@@ -921,6 +921,10 @@ def __init__(self, window):
             self.resource_root / 'shaders/line_generic_with_colors_vs.glsl',
             self.resource_root / 'shaders/line_generic_with_colors_fs.glsl',
         )
+        self.shape_element_list_program = self.load_program(
+            self.resource_root / 'shaders/shape_element_list_vs.glsl',
+            self.resource_root / 'shaders/shape_element_list_fs.glsl',
+        )
 
     @property
     def gl_version(self):