diff options
author | Karl Berry <karl@freefriends.org> | 2019-10-06 17:17:34 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-10-06 17:17:34 +0000 |
commit | 7f9f7dad00ea5f025578c491005835740f9ffd90 (patch) | |
tree | 011a87a78042a82ea3a18f5c08e60f6a3930bf0b /Build/source/utils/asymptote/shaders.cc | |
parent | 37d8fb68e502daabe6aa5f5ae9fb78191f275742 (diff) |
asy 2.56 sources
git-svn-id: svn://tug.org/texlive/trunk@52300 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/shaders.cc')
-rw-r--r-- | Build/source/utils/asymptote/shaders.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Build/source/utils/asymptote/shaders.cc b/Build/source/utils/asymptote/shaders.cc index bbdf12a3a90..1c693f92caa 100644 --- a/Build/source/utils/asymptote/shaders.cc +++ b/Build/source/utils/asymptote/shaders.cc @@ -14,24 +14,25 @@ #include "shaders.h" GLuint compileAndLinkShader(std::vector<ShaderfileModePair> const& shaders, - size_t NLights, size_t NMaterials, + size_t Nlights, size_t NMaterials, std::vector<std::string> const& defineflags) { GLuint mainShader = glCreateProgram(); std::vector<GLuint> compiledShaders; - for (auto const& shaderInfo : shaders) { - GLint newshader=createShaderFile(shaderInfo.first,shaderInfo.second, - NLights,NMaterials,defineflags); + size_t n=shaders.size(); + for(size_t i=0; i < n; ++i) { + GLint newshader=createShaderFile(shaders[i].first,shaders[i].second, + Nlights,NMaterials,defineflags); glAttachShader(mainShader,newshader); compiledShaders.push_back(newshader); } glLinkProgram(mainShader); - for (auto const& compiledShader : compiledShaders) { - glDetachShader(mainShader,compiledShader); - glDeleteShader(compiledShader); + for(size_t i=0; i < n; ++i) { + glDetachShader(mainShader,compiledShaders[i]); + glDeleteShader(compiledShaders[i]); } return mainShader; @@ -85,11 +86,10 @@ GLuint createShaderFile(std::string file, int shaderType, size_t Nlights, shaderSrc << "#version " << GLSL_VERSION << "\r\n"; shaderSrc << "#extension GL_ARB_uniform_buffer_object : enable" << "\r\n"; - shaderSrc << "#extension GL_ARB_shading_language_packing : enable" - << "\r\n"; - for (std::string const& flag : defineflags) { - shaderSrc << "#define " << flag << "\r\n"; + size_t n=defineflags.size(); + for(size_t i=0; i < n; ++i) { + shaderSrc << "#define " << defineflags[i] << "\r\n"; } shaderSrc << "const int Nlights=" << Nlights << ";\r\n"; |