projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move texture compiler to native code
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
model_font.fs
diff --git
a/shaders/model_font.fs
b/shaders/model_font.fs
index 673238c39417885bb90baa8822d299437d34a9e6..fa8c6e78b89ad2815bb085763135c80753153639 100644
(file)
--- a/
shaders/model_font.fs
+++ b/
shaders/model_font.fs
@@
-1,18
+1,17
@@
-
out vec4 FragColo
r;
+
layout (location = 0) out vec4 oColou
r;
uniform sampler2D uTexMain;
uniform vec4 uColour;
uniform sampler2D uTexMain;
uniform vec4 uColour;
-in vec4 aColour;
in vec2 aUv;
in vec2 aUv;
-in vec
3
aNorm;
+in vec
4
aNorm;
in vec3 aCo;
#include "motion_vectors_fs.glsl"
in vec3 aCo;
#include "motion_vectors_fs.glsl"
+#include "depth_compare.glsl"
-void main()
-{
+void main()
{
+ depth_compare_dither();
compute_motion_vectors();
compute_motion_vectors();
- vec4 diffuse = texture( uTexMain, aUv );
- FragColor = vec4( diffuse.rgb, 1.0 ) * uColour;
+ oColour = texture( uTexMain, aUv ) * uColour;
}
}