progress?

This commit is contained in:
2019-08-13 15:38:10 +02:00
parent 1a9e37df79
commit c11ed5c897
3 changed files with 76 additions and 68 deletions

View File

@@ -1,11 +1,12 @@
#version 450
#extension GL_ARB_separate_shader_objects : enable
layout(location = 0) in vec2 tex_coords;
layout(location = 0) out vec4 f_color;
layout(location = 0) out vec4 out_color;
layout(set = 0, binding = 0) uniform sampler2D tex;
layout(binding = 1) uniform sampler2D tex;
void main() {
f_color = texture(tex, tex_coords);
out_color = texture(tex, tex_coords);
}

View File

@@ -1,17 +1,17 @@
#version 450
#extension GL_ARB_separate_shader_objects : enable
layout(binding = 0) uniform UniformBufferObject {
mat4 view;
mat4 projection;
float time;
} ubo;
layout(location = 0) in vec3 position;
layout(location = 1) in vec2 uv;
layout(location = 0) out vec2 tex_coords;
//layout(binding = 0) uniform UniformBufferObject {
// mat4 view;
// mat4 projection;
// float time;
//} ubo;
layout(push_constant) uniform PushConstants {
mat4 model;
mat4 view;