matthias/wc3re
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optimize object shaders

Browse Source
This commit is contained in:
Matthias Blankertz
2015-05-04 14:01:55 +02:00
parent c11b0f7a09
commit 36fd30d063
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
shaders/object.fs
View File

@@ -8,6 +8,7 @@ layout(location = 4) uniform uint animFrame;
layout(location = 5) uniform vec3 IDcolor; layout(location = 5) uniform vec3 IDcolor;
in vec2 fragTC; in vec2 fragTC;
flat in uint fragUseAnimTex; flat in uint fragUseAnimTex;
layout(location = 0) out vec4 color; layout(location = 0) out vec4 color;
@@ -15,16 +16,10 @@ layout(location = 1) out vec4 IDcolor_out;
layout(depth_unchanged) out float gl_FragDepth; layout(depth_unchanged) out float gl_FragDepth;
void main(void) { void main(void) {
vec2 texDx = dFdx(fragTC); color = bool(fragUseAnimTex)?texture(texAnim, vec3(fragTC, animFrame)):texture(texBase, fragTC);
vec2 texDy = dFdy(fragTC);
if (color.w < 0.5)
if (fragUseAnimTex > 0u) discard;
color = textureGrad(texAnim, vec3(fragTC, animFrame), texDx, texDy);
else IDcolor_out = vec4(IDcolor, 1.0);
color = textureGrad(texBase, fragTC, texDx, texDy);
if (color.w < 0.5)
discard;
IDcolor_out = vec4(IDcolor, 1.0);
} }

1
shaders/object.vs
View File

@@ -10,6 +10,7 @@ layout(location = 1) in vec2 vertexTC;
layout(location = 2) in uint useAnimTex; layout(location = 2) in uint useAnimTex;
out vec2 fragTC; out vec2 fragTC;
flat out uint fragUseAnimTex; flat out uint fragUseAnimTex;
void main(void) { void main(void) {