Changeset e5d4aca in opengl-game for shaders

Timestamp:

Aug 22, 2019, 2:19:56 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

6544020

Parents:

c8c6da8

Message:

Create separate descriptor pools and descriptor sets for each shader group and start removing unnecessary elements from the overlay shaders

Location:

shaders

Files:

• overlay.frag (modified) (2 diffs)
• overlay.vert (modified) (2 diffs)

shaders/overlay.frag

@@ -2 +2 @@
 #extension GL_ARB_separate_shader_objects : enable
 
-layout(binding = 1) uniform sampler2D texSampler;
-layout(binding = 2) uniform sampler2D uiTexSampler;
+layout(binding = 0) uniform sampler2D uiTexSampler;
 
 layout(location = 0) in vec3 fragColor;
@@ -12 +11 @@
 
 void main() {
+   outColor = texture(uiTexSampler, fragTexCoord);
+
    if (isOverlay == 1) {
       outColor = texture(uiTexSampler, fragTexCoord);
    } else {
-      outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb, 1.0);
+      outColor = vec4(fragColor * texture(uiTexSampler, fragTexCoord).rgb, 1.0);
    }
 }

shaders/overlay.vert

@@ -1 +1 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
-
-layout (binding = 0) uniform UniformBufferObject {
-   mat4 model;
-   mat4 view;
-   mat4 proj;
-} ubo;
 
 layout(location = 0) in vec3 inPosition;
@@ -17 +11 @@
 
 void main() {
-   if (gl_VertexIndex < 8) {
-      gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
+   if (gl_VertexIndex < 0) {
       fragColor = inColor;
       isOverlay = 0;
    } else {
-      gl_Position = vec4(inPosition, 1.0);
-      fragColor = vec3(1.0, 1.0, 1.0);
+      fragColor = inColor;
       isOverlay = 1;
    }
 
    fragTexCoord = inTexCoord;
+   gl_Position = vec4(inPosition, 1.0);
 }