This commit is contained in:
2020-06-27 00:05:25 +02:00
parent 067ca2edf4
commit 15f3952c1b
7 changed files with 22 additions and 29 deletions

View File

@@ -1,7 +1,7 @@
#version 450
#extension GL_ARB_separate_shader_objects : enable
layout(binding = 0) uniform UniformBufferObject {
layout(binding = 0) uniform ObjectUniformData {
mat4 view;
mat4 projection;
float time;
@@ -14,8 +14,6 @@ layout(location = 0) out vec2 tex_coords;
layout(push_constant) uniform PushConstants {
mat4 model;
mat4 view;
mat4 projection;
} push;
out gl_PerVertex {
@@ -23,6 +21,6 @@ out gl_PerVertex {
};
void main() {
gl_Position = push.projection * push.view * push.model * vec4(position, 1.0);
gl_Position = ubo.projection * ubo.view * push.model * vec4(position, 1.0);
tex_coords = uv;
}