Add texture in demo

This commit is contained in:
Lynix
2020-03-18 13:48:05 +01:00
parent 9cc206b33e
commit 4ede9f1cfe
15 changed files with 359 additions and 40 deletions

View File

@@ -3,11 +3,14 @@
#extension GL_ARB_separate_shader_objects : enable
#extension GL_ARB_shading_language_420pack : enable
layout(binding = 1) uniform sampler2D texSampler;
layout (location = 0) in vec3 inColor;
layout (location = 1) in vec2 outTexCoords;
layout (location = 0) out vec4 outFragColor;
void main()
{
outFragColor = vec4(inColor, 1.0);
}
outFragColor = texture(texSampler, outTexCoords);
}

View File

@@ -5,6 +5,7 @@
layout (location = 0) in vec3 inPos;
layout (location = 1) in vec3 inColor;
layout (location = 2) in vec2 inTexCoord;
layout (binding = 0) uniform UBO
{
@@ -14,6 +15,7 @@ layout (binding = 0) uniform UBO
} ubo;
layout (location = 0) out vec3 outColor;
layout (location = 1) out vec2 outTexCoords;
out gl_PerVertex
{
@@ -24,5 +26,6 @@ out gl_PerVertex
void main()
{
outColor = inColor;
outTexCoords = inTexCoord;
gl_Position = ubo.projectionMatrix * ubo.viewMatrix * ubo.modelMatrix * vec4(inPos, 1.0);
}