diff options
author | omniscient <17525998+omnisci3nce@users.noreply.github.com> | 2024-10-19 13:24:31 +1100 |
---|---|---|
committer | omniscient <17525998+omnisci3nce@users.noreply.github.com> | 2024-10-19 13:24:31 +1100 |
commit | 6182860f1b1aba4128b4f66eda7977600e60d1a0 (patch) | |
tree | 388d9aff8ca19ef324633ac1bea43f1548675150 /assets/shaders/object.frag | |
parent | 5d1750d9adfc45b53c75310c58e31dfdbd8a6e15 (diff) | |
parent | d6d742f8a24490f885e4a1ae3fea7ec46b01f58c (diff) |
fix merge
Diffstat (limited to 'assets/shaders/object.frag')
-rw-r--r-- | assets/shaders/object.frag | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/assets/shaders/object.frag b/assets/shaders/object.frag deleted file mode 100644 index fa50fcf..0000000 --- a/assets/shaders/object.frag +++ /dev/null @@ -1,15 +0,0 @@ -#version 450 -#extension GL_ARB_separate_shader_objects : enable - -layout(location = 0) in vec3 in_position; -layout(location = 1) in vec3 in_normal; -layout(location = 2) in vec2 in_tex_coord; - -layout(set = 0, binding = 1) uniform sampler2D texSampler; - -layout(location = 0) out vec4 out_color; - -void main() { - // out_color = vec4(1.0); - out_color = texture(texSampler, in_tex_coord); -}
\ No newline at end of file |