Shader optimization

Author: bladekt

common/src/main/kotlin/com/lambda/graphics/shader/Shader.kt

@@ -28,8 +28,7 @@ class Shader(fragmentPath: String, vertexPath: String) {
 
     fun use() {
         glUseProgram(id)
-        set("u_Projection", RenderMain.projectionMatrix)
-        set("u_ModelView", RenderMain.modelViewMatrix)
+        set("u_ProjModel", Matrix4f(RenderMain.projectionMatrix).mul(RenderMain.modelViewMatrix))
     }
 
     private fun loc(name: String) =

common/src/main/resources/assets/lambda/shaders/vertex/renderer/box_dynamic.vert

@@ -4,8 +4,7 @@ layout (location = 0) in vec3 pos1;
 layout (location = 1) in vec3 pos2;
 layout (location = 2) in vec4 color;
 
-uniform mat4 u_Projection;
-uniform mat4 u_ModelView;
+uniform mat4 u_ProjModel;
 
 uniform float u_TickDelta;
 uniform vec3 u_CameraPosition;
@@ -15,6 +14,6 @@ out vec4 v_Color;
 #define VERTEX_POSITION mix(pos1, pos2, u_TickDelta) - u_CameraPosition
 
 void main() {
-    gl_Position = u_Projection * u_ModelView * vec4(VERTEX_POSITION, 1.0);
+    gl_Position = u_ProjModel * vec4(VERTEX_POSITION, 1.0);
     v_Color = color;
 }

common/src/main/resources/assets/lambda/shaders/vertex/renderer/box_static.vert

@@ -3,16 +3,14 @@
 layout (location = 0) in vec3 pos;
 layout (location = 1) in vec4 color;
 
-uniform mat4 u_Projection;
-uniform mat4 u_ModelView;
-
+uniform mat4 u_ProjModel;
 uniform vec3 u_CameraPosition;
 
 out vec4 v_Color;
 
 #define VERTEX_POSITION pos - u_CameraPosition
 
 void main() {
-    gl_Position = u_Projection * u_ModelView * vec4(VERTEX_POSITION, 1.0);
+    gl_Position = u_ProjModel * vec4(VERTEX_POSITION, 1.0);
     v_Color = color;
 }

common/src/main/resources/assets/lambda/shaders/vertex/renderer/font.vert

@@ -4,14 +4,13 @@ layout (location = 0) in vec4 pos;
 layout (location = 1) in vec2 uv;
 layout (location = 2) in vec4 color;
 
-uniform mat4 u_Projection;
-uniform mat4 u_ModelView;
+uniform mat4 u_ProjModel;
 
 out vec2 v_TexCoord;
 out vec4 v_Color;
 
 void main() {
-    gl_Position = u_Projection * u_ModelView * pos;
+    gl_Position = u_ProjModel * pos;
 
     v_TexCoord = uv;
     v_Color = color;

common/src/main/resources/assets/lambda/shaders/vertex/renderer/rect_filled.vert

@@ -7,8 +7,7 @@ layout (location = 3) in float round;
 layout (location = 4) in float shade;
 layout (location = 5) in vec4 color;
 
-uniform mat4 u_Projection;
-uniform mat4 u_ModelView;
+uniform mat4 u_ProjModel;
 
 out vec2 v_Position;
 out vec2 v_TexCoord;
@@ -18,7 +17,7 @@ out float v_RoundRadius;
 out float v_Shade;
 
 void main() {
-    gl_Position = u_Projection * u_ModelView * pos;
+    gl_Position = u_ProjModel * pos;
 
     v_Position = gl_Position.xy * 0.5 + 0.5;
     v_TexCoord = uv;

common/src/main/resources/assets/lambda/shaders/vertex/renderer/rect_outline.vert

@@ -5,16 +5,15 @@ layout (location = 1) in float alpha;
 layout (location = 2) in float shade;
 layout (location = 3) in vec4 color;
 
-uniform mat4 u_Projection;
-uniform mat4 u_ModelView;
+uniform mat4 u_ProjModel;
 
 out vec2 v_Position;
 out float v_Alpha;
 out vec4 v_Color;
 out float v_Shade;
 
 void main() {
-    gl_Position = u_Projection * u_ModelView * pos;
+    gl_Position = u_ProjModel * pos;
 
     v_Position = gl_Position.xy * 0.5 + 0.5;
     v_Alpha = alpha;

common/src/main/resources/assets/lambda/shaders/vertex/renderer/tracer_dynamic.vert

@@ -4,8 +4,7 @@ layout (location = 0) in vec3 pos1;
 layout (location = 1) in vec3 pos2;
 layout (location = 2) in vec4 color;
 
-uniform mat4 u_Projection;
-uniform mat4 u_ModelView;
+uniform mat4 u_ProjModel;
 
 uniform float u_TickDelta;
 uniform vec3 u_CameraPosition;
@@ -15,7 +14,7 @@ out vec4 v_Color;
 #define VERTEX_POSITION mix(pos1, pos2, u_TickDelta) - u_CameraPosition
 
 #define SCREEN_CENTER vec4(0.0, 0.0, 0.0, 1.0)
-#define PROJECTED u_Projection * u_ModelView * vec4(VERTEX_POSITION, 1.0)
+#define PROJECTED u_ProjModel * vec4(VERTEX_POSITION, 1.0)
 
 void main() {
     gl_Position = gl_VertexID % 2 == 0 ? SCREEN_CENTER : PROJECTED;

common/src/main/resources/assets/lambda/shaders/vertex/renderer/tracer_static.vert

@@ -3,8 +3,7 @@
 layout (location = 0) in vec3 pos;
 layout (location = 1) in vec4 color;
 
-uniform mat4 u_Projection;
-uniform mat4 u_ModelView;
+uniform mat4 u_ProjModel;
 
 uniform vec3 u_CameraPosition;
 
@@ -13,7 +12,7 @@ out vec4 v_Color;
 #define VERTEX_POSITION pos - u_CameraPosition
 
 #define SCREEN_CENTER vec4(0.0, 0.0, 0.0, 1.0)
-#define PROJECTED u_Projection * u_ModelView * vec4(VERTEX_POSITION, 1.0)
+#define PROJECTED u_ProjModel * vec4(VERTEX_POSITION, 1.0)
 
 void main() {
     gl_Position = gl_VertexID % 2 == 0 ? SCREEN_CENTER : PROJECTED;