Changeset fba08f2 in opengl-game for shaders

Timestamp:

Aug 2, 2019, 4:15:02 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

4f63fa8

Parents:

621664a

git-author:

Dmitry Portnoy <dmp1488@…> (08/02/19 04:01:00)

git-committer:

Dmitry Portnoy <dmp1488@…> (08/02/19 04:15:02)

Message:

Update vulkan-game.cpp to support texturing in the shader

Location:

shaders

Files:

• shader.frag (modified) (1 diff)
• shader.vert (modified) (2 diffs)

shaders/shader.frag

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

shaders/shader.vert

@@ -1 +1 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
+
+vec2 positions[3] = vec2[](
+    vec2( 0.0,  0.5),
+    vec2(-0.5, -0.5),
+    vec2( 0.5, -0.5)
+);
 
 layout (binding = 0) uniform UniformBufferObject {
@@ -10 +16 @@
 layout(location = 0) in vec2 inPosition;
 layout(location = 1) in vec3 inColor;
+layout(location = 2) in vec2 inTexCoord;
 
 layout(location = 0) out vec3 fragColor;
+layout(location = 1) out vec2 fragTexCoord;
 
 void main() {
-   gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 0.0, 1.0);
+   // gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 0.0, 1.0);
+   gl_Position = ubo.proj * ubo.view * ubo.model * vec4(positions[gl_VertexIndex], -5.0, 1.0);
    fragColor = inColor;
+   fragTexCoord = inTexCoord;
 }