Use Vulkan result check macro, code cleanup, added text overlay

This commit is contained in:
saschawillems 2016-05-23 22:27:32 +02:00
parent 823c666ffc
commit faa59a2f78
13 changed files with 150 additions and 182 deletions

View file

@ -17,17 +17,14 @@ layout (binding = 0) uniform UBO
layout (location = 0) out vec3 outColor;
layout (location = 1) out vec2 outUV;
out gl_PerVertex
{
vec4 gl_Position;
};
void main()
{
outUV = inUV;
/*
if (inColor.r >= 0.9)
{
outColor = ubo.glowColor.rgb;
}
else*/
{
outColor = inColor;
}
outColor = inColor;
gl_Position = ubo.projection * ubo.model * inPos;
}

View file

@ -14,6 +14,11 @@ layout (binding = 0) uniform UBO
layout (location = 0) out vec2 outUV;
out gl_PerVertex
{
vec4 gl_Position;
};
void main()
{
outUV = inUV;

View file

@ -20,6 +20,11 @@ layout (location = 2) out vec3 outColor;
layout (location = 3) out vec3 outViewVec;
layout (location = 4) out vec3 outLightVec;
out gl_PerVertex
{
vec4 gl_Position;
};
void main()
{
outNormal = inNormal;

Binary file not shown.

View file

@ -13,6 +13,12 @@ layout (binding = 0) uniform UBO
layout (location = 0) out vec3 outUVW;
out gl_PerVertex
{
vec4 gl_Position;
};
void main()
{
outUVW = inPos;

Binary file not shown.