diff options
author | Norbert Preining <norbert@preining.info> | 2020-08-07 03:02:55 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-08-07 03:02:55 +0000 |
commit | 3710c23789342d9d88783cbe9ad23eb5263a7c33 (patch) | |
tree | 1c40b2bfb9f6b652f7877ad0991f5d6b44391154 /graphics/asymptote/shaders.cc | |
parent | d99fea72e367e8d4d2809b43b3b0206b1bb526b8 (diff) |
CTAN sync 202008070302
Diffstat (limited to 'graphics/asymptote/shaders.cc')
-rw-r--r-- | graphics/asymptote/shaders.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/graphics/asymptote/shaders.cc b/graphics/asymptote/shaders.cc index ab0c194917..a9c038c229 100644 --- a/graphics/asymptote/shaders.cc +++ b/graphics/asymptote/shaders.cc @@ -13,7 +13,7 @@ #include "shaders.h" -GLuint compileAndLinkShader(std::vector<ShaderfileModePair> const& shaders, +GLuint compileAndLinkShader(std::vector<ShaderfileModePair> const& shaders, size_t Nlights, size_t NMaterials, std::vector<std::string> const& defineflags) { @@ -33,7 +33,7 @@ GLuint compileAndLinkShader(std::vector<ShaderfileModePair> const& shaders, glBindAttribLocation(shader,materialAttrib,"material"); glBindAttribLocation(shader,colorAttrib,"color"); glBindAttribLocation(shader,widthAttrib,"width"); - + glLinkProgram(shader); for(size_t i=0; i < n; ++i) { @@ -50,12 +50,12 @@ GLuint createShaders(GLchar const* src, int shaderType, GLuint shader=glCreateShader(shaderType); glShaderSource(shader, 1, &src, NULL); glCompileShader(shader); - + GLint status; glGetShaderiv(shader, GL_COMPILE_STATUS, &status); if(status != GL_TRUE) { - GLint length; + GLint length; glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length); @@ -70,7 +70,7 @@ GLuint createShaders(GLchar const* src, int shaderType, std::cerr << std::endl << "GL Compile error" << std::endl; std::cerr << src << std::endl; - throw 1; + throw 1; } return shader; } @@ -88,7 +88,7 @@ GLuint createShaderFile(std::string file, int shaderType, size_t Nlights, #else #define GLSL_VERSION "130" #endif - + shaderSrc << "#version " << GLSL_VERSION << "\n"; shaderSrc << "#extension GL_ARB_uniform_buffer_object : enable" << "\n"; |