claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unused uv vertex attribute

Browse source 
Fixes #412
This commit is contained in:
saschawillems 2018-02-24 10:39:02 +01:00
parent a0ae08864d
commit 3f92d4c0df
5 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/shaders/pbrbasic/pbr.frag
View file

@ -2,7 +2,6 @@
layout (location = 0) in vec3 inWorldPos; layout (location = 0) in vec3 inWorldPos;
layout (location = 1) in vec3 inNormal; layout (location = 1) in vec3 inNormal;
layout (location = 2) in vec2 inUV;
layout (binding = 0) uniform UBO layout (binding = 0) uniform UBO
{ {

BIN
data/shaders/pbrbasic/pbr.frag.spv
View file

Binary file not shown.

6
data/shaders/pbrbasic/pbr.vert
View file

@ -1,11 +1,7 @@
#version 450 #version 450
#extension GL_ARB_separate_shader_objects : enable
#extension GL_ARB_shading_language_420pack : enable
layout (location = 0) in vec3 inPos; layout (location = 0) in vec3 inPos;
layout (location = 1) in vec3 inNormal; layout (location = 1) in vec3 inNormal;
layout (location = 2) in vec2 inUV;
layout (binding = 0) uniform UBO layout (binding = 0) uniform UBO
{ {
@ -17,7 +13,6 @@ layout (binding = 0) uniform UBO
layout (location = 0) out vec3 outWorldPos; layout (location = 0) out vec3 outWorldPos;
layout (location = 1) out vec3 outNormal; layout (location = 1) out vec3 outNormal;
layout (location = 2) out vec2 outUV;
layout(push_constant) uniform PushConsts { layout(push_constant) uniform PushConsts {
vec3 objPos; vec3 objPos;
@ -33,6 +28,5 @@ void main()
vec3 locPos = vec3(ubo.model * vec4(inPos, 1.0)); vec3 locPos = vec3(ubo.model * vec4(inPos, 1.0));
outWorldPos = locPos + pushConsts.objPos; outWorldPos = locPos + pushConsts.objPos;
outNormal = mat3(ubo.model) * inNormal; outNormal = mat3(ubo.model) * inNormal;
outUV = inUV;
gl_Position = ubo.projection * ubo.view * vec4(outWorldPos, 1.0); gl_Position = ubo.projection * ubo.view * vec4(outWorldPos, 1.0);
} }

BIN
data/shaders/pbrbasic/pbr.vert.spv
View file

Binary file not shown.

1
examples/pbrbasic/pbrbasic.cpp
View file

@ -332,7 +332,6 @@ public:
std::vector<VkVertexInputAttributeDescription> vertexInputAttributes = { std::vector<VkVertexInputAttributeDescription> vertexInputAttributes = {
vks::initializers::vertexInputAttributeDescription(0, 0, VK_FORMAT_R32G32B32_SFLOAT, 0), // Position vks::initializers::vertexInputAttributeDescription(0, 0, VK_FORMAT_R32G32B32_SFLOAT, 0), // Position
vks::initializers::vertexInputAttributeDescription(0, 1, VK_FORMAT_R32G32B32_SFLOAT, sizeof(float) * 3), // Normal vks::initializers::vertexInputAttributeDescription(0, 1, VK_FORMAT_R32G32B32_SFLOAT, sizeof(float) * 3), // Normal
vks::initializers::vertexInputAttributeDescription(0, 2, VK_FORMAT_R32G32_SFLOAT, sizeof(float) * 5), // UV
}; };
VkPipelineVertexInputStateCreateInfo vertexInputState = vks::initializers::pipelineVertexInputStateCreateInfo(); VkPipelineVertexInputStateCreateInfo vertexInputState = vks::initializers::pipelineVertexInputStateCreateInfo();