Adjust uniform organization for UnlitMaterial

[libs/gl.git] / shaderlib / unlit.glsl

diff --git a/shaderlib/unlit.glsl b/shaderlib/unlit.glsl
index 57be8b1ba1acc571b7d0dbbbdcd691a1d1a7dd96..85275558b399346b8b1a89758b80ac52ea9d3458 100644 (file)
--- a/shaderlib/unlit.glsl
+++ b/shaderlib/unlit.glsl
@@ -1,19 +1,28 @@
 import msp_interface;
 import common;
 
-uniform sampler2D texture;
-uniform vec4 tint;
+struct UnlitMaterialParameters
+{
+       vec4 color;
+};
+
+uniform UnlitMaterial
+{
+       UnlitMaterialParameters unlit_material;
+};
+
+uniform sampler2D color_tex;
 
 layout(constant_id=auto) const bool use_texture = false;
 layout(constant_id=auto) const bool use_vertex_color = false;
 layout(constant_id=auto) const bool use_fog = false;
 
 #pragma MSP stage(fragment)
-vec4 get_color()
+virtual vec4 get_color()
 {
-       vec4 result = tint;
+       vec4 result = unlit_material.color;
        if(use_texture)
-               result *= texture(texture, texcoord.xy);
+               result *= texture(color_tex, texcoord.xy);
        if(use_vertex_color)
                result *= color;
        return result;