Refactor Instanced Drawing to use Vertex Arrays

Per-instanced data was previously stored in uniforms. This required
several OpenGL calls to upload all of the data, and it was more complex
to prepare (several vecs vs one).

Additionally, drawing APIs are now accessible through a `RenderApi`
(obtained through `QuadRenderer::with_api`) which enables some RAII
patterns. Specifically, checks for batch flushing are handled in Drop.

1 files changed, 2 insertions, 5 deletions

diff --git a/res/text.f.glsl b/res/text.f.glsl
index d3265712..d2defb39 100644
--- a/res/text.f.glsl
+++ b/res/text.f.glsl
@@ -1,17 +1,14 @@
 #version 330 core
 in vec2 TexCoords;
-flat in int InstanceId;
+in vec3 fg;
 
 layout(location = 0, index = 0) out vec4 color;
 layout(location = 0, index = 1) out vec4 alphaMask;
 
 uniform sampler2D mask;
-uniform ivec3 textColor[32];
 
 void main()
 {
-    int i = InstanceId;
     alphaMask = vec4(texture(mask, TexCoords).rgb, 1.0);
-    vec3 textColorF = vec3(textColor[i]) / vec3(255.0, 255.0, 255.0);
-    color = vec4(textColorF, 1.0);
+    color = vec4(fg, 1.0);
 }