Some wierd shader faults and merge error fixe

This commit is contained in:
Tleety
2016-01-27 15:54:36 +01:00
parent 0e70dc6fa3
commit a63ecb8133
3 changed files with 7 additions and 8 deletions
@@ -1,4 +1,5 @@
#version 430
#extension GL_EXT_gpu_shader4 : enable
layout (binding = 0) uniform sampler2D Texture;
@@ -1,4 +1,5 @@
#version 430
#extension GL_EXT_gpu_shader4 : enable
layout (binding = 0) uniform sampler2D Texture;