scary quads and nice sprites

resources/shaders/source/font.frag.glsl

@@ -1,18 +0,0 @@
-#version 330 core
-
-// viewsize.x = viewport width in pixels; viewsize.y = viewport height in pixels
-uniform ivec2 viewsize;
-uniform ivec2 texturesize;
-
-// texture uv coordinate in texture space
-in vec2 uv;
-uniform sampler2DRect ts;
-
-const vec3 textcolor = vec3(1.0, 1.0, 1.0);
-
-
-void main()
-{
-	//gl_FragColor = vec4(1.0f,0.0f,0.0f,1.0f);
-	gl_FragColor = vec4(textcolor, texture(ts, uv));
-}

resources/shaders/source/font.vert.glsl

@@ -1,26 +0,0 @@
-#version 330 core
-
-// viewsize.x = viewport width in pixels; viewsize.y = viewport height in pixels
-uniform ivec2 viewsize;
-uniform ivec2 texturesize;
-
-// both position and and uv are in pixels, they where converted to floats when 
-// passed to the shader
-layout(location = 0) in vec2 position;
-layout(location = 1) in vec2 txcoord;
-
-out vec2 uv;
-
-void main()
-{
-	vec2 v = vec2(float(viewsize.x), float(viewsize.y));
-	
-//	vec2 p = vec2(position.x*2.0f/v.x - 1.0f, position.y*2.0f/v.y - 1.0f);
-	vec2 p = vec2(position.x*2.0/v.x - 1.0, 1.0 - position.y*2.0/v.y);
-	vec4 pos = vec4(p.x, p.y, 0.0f, 1.0f);
-
-	gl_Position = pos;
-	// since the texture is a GL_TEXTURE_RECTANGLE the coordintes do not need to
-	// be normalized
-	uv = vec2(txcoord.x, txcoord.y);
-}

resources/shaders/source/sprite.frag.glsl

@@ -0,0 +1,14 @@
+#version 450
+
+layout(location = 0) in vec2 uv;
+layout(location = 0) out vec4 fragColor;
+
+layout(set = 2, binding = 0) uniform sampler2D tx;
+
+void main()
+{
+    ivec2 ts = textureSize(tx, 0);
+    vec2 fts = vec2(float(ts.x), float(ts.y));
+    vec2 real_uv = uv / fts;
+    fragColor = texture(tx, real_uv);
+}

resources/shaders/source/sprite.vert.glsl

@@ -0,0 +1,22 @@
+#version 450
+
+layout(set = 1, binding = 0) uniform Viewport {
+    ivec2 view;
+    ivec2 not_needed;
+};
+
+layout(location = 0) in ivec2 position;
+layout(location = 1) in ivec2 in_uv;
+layout(location = 2) in ivec4 color;
+
+layout(location = 0) out vec2 out_uv;
+
+void main()
+{
+    vec2 pos;
+	pos.x = float(position.x)*2.0 / view.x - 1.0;
+	pos.y = -(float(position.y)*2.0 / view.y - 1.0);
+	gl_Position = vec4(pos, 0.0, 1.0);
+
+    out_uv = vec2(float(in_uv.x), float(in_uv.y));
+}