Removed unused instance and vertex attributes

This commit is contained in:
saschawillems 2016-10-10 20:45:54 +02:00
parent 01b3aefde2
commit 10b3d0b53c
7 changed files with 15 additions and 44 deletions

View file

@ -7,8 +7,8 @@ layout (constant_id = 0) const int MAX_LOD_LEVEL = 5;
struct InstanceData
{
vec4 pos;
vec4 rot;
vec3 pos;
float scale;
};
// Binding 0: Instance input data for culling

View file

@ -5,9 +5,8 @@
layout (location = 0) in vec3 inNormal;
layout (location = 1) in vec3 inColor;
layout (location = 2) in vec3 inUV;
layout (location = 3) in vec3 inViewVec;
layout (location = 4) in vec3 inLightVec;
layout (location = 2) in vec3 inViewVec;
layout (location = 3) in vec3 inLightVec;
layout (location = 0) out vec4 outFragColor;

View file

@ -6,14 +6,11 @@
// Vertex attributes
layout (location = 0) in vec4 inPos;
layout (location = 1) in vec3 inNormal;
layout (location = 2) in vec2 inUV;
layout (location = 3) in vec3 inColor;
layout (location = 2) in vec3 inColor;
// Instanced attributes
layout (location = 4) in vec3 instancePos;
layout (location = 5) in vec3 instanceRot;
layout (location = 6) in float instanceScale;
layout (location = 7) in float instanceTexIndex;
layout (location = 5) in float instanceScale;
layout (binding = 0) uniform UBO
{
@ -23,9 +20,8 @@ layout (binding = 0) uniform UBO
layout (location = 0) out vec3 outNormal;
layout (location = 1) out vec3 outColor;
layout (location = 2) out vec3 outUV;
layout (location = 3) out vec3 outViewVec;
layout (location = 4) out vec3 outLightVec;
layout (location = 2) out vec3 outViewVec;
layout (location = 3) out vec3 outLightVec;
out gl_PerVertex
{
@ -35,12 +31,10 @@ out gl_PerVertex
void main()
{
outColor = inColor;
outUV = vec3(inUV, instanceTexIndex);
outUV.t = 1.0 - outUV.t;
outNormal = inNormal;// * mat3(rotMat);
outNormal = inNormal;
vec4 pos = vec4((inPos.xyz * instanceScale) + instancePos, 1.0)/* rotMat*/;
vec4 pos = vec4((inPos.xyz * instanceScale) + instancePos, 1.0);
gl_Position = ubo.projection * ubo.modelview * pos;