Changeset f00ee54 in opengl-game for shaders/scene.frag

Timestamp:

Aug 25, 2019, 12:58:06 AM (6 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

721e8be

Parents:

d53ef6a

Message:

Refactor the code to allow different graphics pipelines to use different Vertex structs and different uniform and vertex attributes

File:

• shaders/scene.frag (modified) (1 diff)

shaders/scene.frag

@@ -3 +3 @@
 
 layout(binding = 1) uniform sampler2D texSampler;
-layout(binding = 2) uniform sampler2D uiTexSampler;
 
 layout(location = 0) in vec3 fragColor;
 layout(location = 1) in vec2 fragTexCoord;
-layout(location = 2) flat in uint isOverlay;
 
 layout(location = 0) out vec4 outColor;
 
 void main() {
-   if (isOverlay == 1) {
-      outColor = texture(uiTexSampler, fragTexCoord);
-   } else {
-      outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb, 1.0);
-   }
+   outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb, 1.0);
 }