First working version

Author: einarf

arcade/resources/system/shaders/lib/sprite.glsl

@@ -30,8 +30,8 @@ vec4 getInstanceColor(sampler2D colorData, int index) {
     return texelFetch(colorData, ivec2(index, 0), 0);
 }
 
-int getInstanceTextureId(isampler2D textureIdData, int index) {
-    return texelFetch(textureIdData, ivec2(index, 0), 0).x;
+int getInstanceTextureId(sampler2D textureIdData, int index) {
+    return int(texelFetch(textureIdData, ivec2(index, 0), 0).x);
 }
 
 int getInstanceIndex(isampler2D indexData, int index) {

arcade/resources/system/shaders/sprites/sprite_list_geometry_cull_geo.glsl

@@ -42,7 +42,7 @@ void main() {
     mat4 mvp = window.projection * window.view;
     // Do viewport culling for sprites.
     // We do this in normalized device coordinates to make it simple
-    // apply projection to the center point. This is important so we get zooming/scrollig right
+    // apply projection to the center point. This is important so we get zooming/scrolling right
     vec2 ct = (mvp * vec4(center.xy, 0.0, 1.0)).xy;
     // We can get away with cheaper calculation of size
     // The length of the diagonal is the cheapest estimation in case rotation is applied

arcade/resources/system/shaders/sprites/sprite_list_simple_fs.glsl

@@ -6,17 +6,18 @@ uniform sampler2D sprite_texture;
 // Global color set on the sprite list
 uniform vec4 spritelist_color;
 
-in vec2 uv;
-in vec4 color;
+in vec2 v_uv;
+in vec4 v_color;
 
 out vec4 f_color;
 
 void main() {
-    vec4 base_color = texture(sprite_texture, uv);
-    base_color *= color * spritelist_color;
+    // vec4 base_color = v_color;
+    vec4 base_color = texture(sprite_texture, v_uv);
+    base_color *= v_color * spritelist_color;
     // Alpha test
     if (base_color.a == 0.0) {
         discard;
     }
-    f_color = base_color + vec4(0.5, 0.5, 0.5, 1.0);
+    f_color = base_color;
 }

arcade/resources/system/shaders/sprites/sprite_list_simple_vs.glsl

@@ -15,7 +15,7 @@ uniform sampler2D uv_texture;
 uniform sampler2D pos_data;
 uniform sampler2D size_data;
 uniform sampler2D color_data;
-uniform isampler2D texture_id_data;
+uniform sampler2D texture_id_data;
 uniform isampler2D index_data;
 
 // How much half-pixel offset to apply to the UVs.
@@ -26,8 +26,8 @@ uniform float uv_offset_bias;
 in vec2 in_pos;
 
 // Output to frag shader
-out vec2 uv;
-out vec4 color;
+out vec2 v_uv;
+out vec4 v_color;
 
 #include :system:shaders/lib/sprite.glsl
 
@@ -55,27 +55,8 @@ void main() {
     // TODO: Half pixel offset
 
     int vertex_id = gl_VertexID % 4;
-    color = color;
-    switch (vertex_id) {
-        case 0:
-            // Upper left
-            gl_Position = mvp * vec4(rot * size + center.xy, center.z, 1.0);
-            uv = uv0;
-            break;
-        case 1:
-            // lower left
-            gl_Position = mvp * vec4(rot * size + center.xy, center.z, 1.0);
-            uv = uv2;
-            break;
-        case 2:
-            // upper right
-            gl_Position = mvp * vec4(rot * size + center.xy, center.z, 1.0);
-            uv = uv1;
-            break;
-        case 3:
-            // lower right
-            gl_Position = mvp * vec4(rot * size + center.xy, center.z, 1.0);
-            uv = uv3;
-            break;
-    }
+    vec2 uvs[4] = {uv0, uv2, uv1, uv3};
+    v_color = color;
+    gl_Position = mvp * vec4(rot * (in_pos * size) + center.xy, 0.0, 1.0);
+    v_uv = uvs[vertex_id];
 }

arcade/sprite_list/sprite_list.py

@@ -908,6 +908,11 @@ def _write_sprite_buffers_to_gpu(self) -> None:
             self._sprite_texture_changed,
             self._sprite_index_changed,
         )
+        self._sprite_pos_angle_changed = False
+        self._sprite_size_changed = False
+        self._sprite_color_changed = False
+        self._sprite_texture_changed = False
+        self._sprite_index_changed = False
 
     def initialize(self) -> None:
         """
@@ -974,6 +979,7 @@ def _grow_sprite_buffers(self) -> None:
         if self._sprite_buffer_slots <= self._buf_capacity:
             return
 
+        print("Growing sprite buffers...")
         # Double the capacity
         extend_by = self._buf_capacity
         self._buf_capacity = self._buf_capacity * 2
@@ -1591,16 +1597,20 @@ def __init__(self, ctx: ArcadeContext, capacity: int, atlas: TextureAtlasBase) -
         )
         # fmt: on
         self._geometry = self.ctx.geometry(
-            [BufferDescription(self._instance_buffer, "2f", ["in_pos"], instanced=True)],
+            [BufferDescription(self._instance_buffer, "2f", ["in_pos"])],
+            mode=self.ctx.TRIANGLE_STRIP,
         )
 
         # Texture buffers for per-sprite data. These are looked up using gl_InstanceID
         self._pos_angle_texture = self.ctx.texture(size=(capacity, 1), components=4, dtype="f4")
         self._size_texture = self.ctx.texture(size=(capacity, 1), components=2, dtype="f4")
         self._color_texture = self.ctx.texture(size=(capacity, 1), components=4, dtype="f1")
-        self._texture_id_texture = self.ctx.texture(size=(capacity, 1), components=1, dtype="i4")
+        self._texture_id_texture = self.ctx.texture(size=(capacity, 1), components=1, dtype="f4")
         self._index_texture = self.ctx.texture(size=(capacity, 1), components=1, dtype="i4")
 
+        # Debugging
+        self._query = self.ctx.query(primitives=True)
+
     def write_sprite_buffers_to_gpu(
         self,
         # The data itself
@@ -1633,26 +1643,22 @@ def write_sprite_buffers_to_gpu(
         """
         if sprite_pos_angle_changed:
             self._pos_angle_texture.write(sprite_pos_angle_data)
-            self._sprite_pos_angle_changed = False
 
         if sprite_size_changed:
             self._size_texture.write(sprite_size_data)
-            self._sprite_size_changed = False
 
         if sprite_color_changed:
             self._color_texture.write(sprite_color_data)
-            self._sprite_color_changed = False
 
         if sprite_texture_changed:
             self._texture_id_texture.write(sprite_texture_data)
-            self._sprite_texture_changed = False
 
         if sprite_index_changed:
             self._index_texture.write(sprite_index_data)
-            self._sprite_index_changed = False
 
     def grow_sprite_buffers(self) -> None:
         """Double the internal storage"""
+        print(f"Growing sprite buffers from {self._buf_capacity} to", self._buf_capacity * 2)
         # Double the capacity
         self._buf_capacity = self._buf_capacity * 2
 
@@ -1714,7 +1720,10 @@ def render(
             else:
                 atlas_texture.filter = default_texture_filter
 
-        self.program["spritelist_color"] = color
+        try:
+            self.program["spritelist_color"] = color
+        except KeyError:
+            pass
 
         # Control center pixel interpolation:
         # 0.0 = raw interpolation using texture corners
@@ -1735,11 +1744,18 @@ def render(
 
         if not self._geometry:
             raise ValueError("Attempting to render without '_geometry' field being set.")
-        self._geometry.render(
-            self.program,
-            mode=self.ctx.POINTS,
-            instances=count,
-        )
+
+        # a = array("i")
+        # a.frombytes(self._index_texture.read())
+        # print("Buffer", a)
+
+        with self._query:
+            self._geometry.render(
+                self.program,
+                # mode=self.ctx.TRIANGLE_STRIP,
+                instances=count,
+            )
+        # print(f"Primitives rendered: {self._query.primitives_generated} (count: {count})")
 
         # Leave global states to default
         if blend: