X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=shaders%2Fmodel_font.fs;h=d0d285106708153a6d4552d5a0ef0a9c4efdca5e;hb=dbbdf411d1aaf70cb995c3371cfae37fd0b7dbcc;hp=673238c39417885bb90baa8822d299437d34a9e6;hpb=d6171f1c56789b2ca79efa3313fbbf74a13bda7a;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/shaders/model_font.fs b/shaders/model_font.fs index 673238c..d0d2851 100644 --- a/shaders/model_font.fs +++ b/shaders/model_font.fs @@ -1,11 +1,10 @@ -out vec4 FragColor; +layout (location = 0) out vec4 oColour; uniform sampler2D uTexMain; uniform vec4 uColour; -in vec4 aColour; in vec2 aUv; -in vec3 aNorm; +in vec4 aNorm; in vec3 aCo; #include "motion_vectors_fs.glsl" @@ -13,6 +12,5 @@ in vec3 aCo; void main() { compute_motion_vectors(); - vec4 diffuse = texture( uTexMain, aUv ); - FragColor = vec4( diffuse.rgb, 1.0 ) * uColour; + oColour = texture( uTexMain, aUv ) * uColour; }