From d0c7629b63b3ee24a0f55b99c48ea67a12b8e8bc Mon Sep 17 00:00:00 2001 From: Rinnegatamante Date: Sat, 17 Oct 2020 18:11:49 +0200 Subject: [PATCH] Removed all references to unused GLSL shader pre-header. --- src/gl/gl3immed.cpp | 8 ++++---- src/gl/gl3matfx.cpp | 4 ++-- src/gl/gl3skin.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gl/gl3immed.cpp b/src/gl/gl3immed.cpp index 2822e61..d55fe8e 100644 --- a/src/gl/gl3immed.cpp +++ b/src/gl/gl3immed.cpp @@ -62,8 +62,8 @@ openIm2D(void) #include "shaders/im2d_gl3.inc" #include "shaders/simple_fs_gl3.inc" #endif - const char *vs[] = { shaderDecl, header_vert_src, im2d_vert_src, nil }; - const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil }; + const char *vs[] = { header_vert_src, im2d_vert_src, nil }; + const char *fs[] = { header_frag_src, simple_frag_src, nil }; im2dShader = Shader::create(vs, fs); assert(im2dShader); } @@ -186,8 +186,8 @@ openIm3D(void) #include "shaders/im3d_gl3.inc" #include "shaders/simple_fs_gl3.inc" #endif - const char *vs[] = { shaderDecl, header_vert_src, im3d_vert_src, nil }; - const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil }; + const char *vs[] = { header_vert_src, im3d_vert_src, nil }; + const char *fs[] = { header_frag_src, simple_frag_src, nil }; im3dShader = Shader::create(vs, fs); assert(im3dShader); } diff --git a/src/gl/gl3matfx.cpp b/src/gl/gl3matfx.cpp index 75b920c..cefaf3b 100644 --- a/src/gl/gl3matfx.cpp +++ b/src/gl/gl3matfx.cpp @@ -172,8 +172,8 @@ matfxOpen(void *o, int32, int32) #else #include "shaders/matfx_gl3.inc" #endif - const char *vs[] = { shaderDecl, header_vert_src, matfx_env_vert_src, nil }; - const char *fs[] = { shaderDecl, header_frag_src, matfx_env_frag_src, nil }; + const char *vs[] = { header_vert_src, matfx_env_vert_src, nil }; + const char *fs[] = { header_frag_src, matfx_env_frag_src, nil }; envShader = Shader::create(vs, fs); assert(envShader); diff --git a/src/gl/gl3skin.cpp b/src/gl/gl3skin.cpp index a9b278b..f1ee740 100644 --- a/src/gl/gl3skin.cpp +++ b/src/gl/gl3skin.cpp @@ -287,8 +287,8 @@ skinOpen(void *o, int32, int32) #include "shaders/simple_fs_gl3.inc" #include "shaders/skin_gl3.inc" #endif - const char *vs[] = { shaderDecl, header_vert_src, skin_vert_src, nil }; - const char *fs[] = { shaderDecl, header_frag_src, simple_frag_src, nil }; + const char *vs[] = { header_vert_src, skin_vert_src, nil }; + const char *fs[] = { header_frag_src, simple_frag_src, nil }; skinShader = Shader::create(vs, fs); assert(skinShader);