diff options
| -rw-r--r-- | CHANGELOG.txt | 3 | ||||
| -rw-r--r-- | bowshock/shader/main.vert.glsl | 2 | ||||
| -rwxr-xr-x | validateShaders.py | 13 |
3 files changed, 10 insertions, 8 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 87d9cc6..c91dd27 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -65,6 +65,9 @@ * Add copyright symbol to startup notice * Bump version specified in CMake +* Fix shader validation script +* Fix shader + # 0.B.2 * Fix data directory not being set correctly by CMake; diff --git a/bowshock/shader/main.vert.glsl b/bowshock/shader/main.vert.glsl index d96415c..3737735 100644 --- a/bowshock/shader/main.vert.glsl +++ b/bowshock/shader/main.vert.glsl @@ -1,6 +1,6 @@ #version 150 core -layout (location = 0x0) in vec3 position; +in vec3 position; void main() { gl_Position = vec4(position.x, position.y, position.z, 1.0f); diff --git a/validateShaders.py b/validateShaders.py index 9dd9f16..d71a3e1 100755 --- a/validateShaders.py +++ b/validateShaders.py @@ -1,14 +1,14 @@ #!/usr/bin/env python -from subprocess import PIPE,run +from subprocess import PIPE, run -def validate(path:str): - print("validating \"",path,"\"... ",end='',sep='') +def validate(path: str): + print("validating \"", path, "\"... ", end='', sep='') - path = "bowshock/shader/" + path + ".glsl" - prog = "glslangValidator" + path = "bowshock/shader/" + path + ".glsl" + program = "glslangValidator" - status = run([prog,path],stdout=PIPE) + status = run([program, path], stdout=PIPE) result = status.returncode if result != 0x0: @@ -20,7 +20,6 @@ def validate(path:str): print("\x1B[38;5;77mokay\x1B[0m") if __name__ == "__main__": - quit(0x0) print("validating shaders...") shaders = [ |