diff options
author | Norbert Preining <norbert@preining.info> | 2019-10-09 03:01:25 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-10-09 03:01:25 +0000 |
commit | 8d5625f5e48587e6ca4304739304ed11b17cb26c (patch) | |
tree | f2c8b0e5f20681e9a35e6c3d33d2ec6a81d05e22 /graphics/asymptote/shaders.cc | |
parent | e5ffc42ed260285f76383ae18dd0f4a603c07fa8 (diff) |
CTAN sync 201910090301
Diffstat (limited to 'graphics/asymptote/shaders.cc')
-rw-r--r-- | graphics/asymptote/shaders.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/graphics/asymptote/shaders.cc b/graphics/asymptote/shaders.cc index 1c693f92ca..877458acaa 100644 --- a/graphics/asymptote/shaders.cc +++ b/graphics/asymptote/shaders.cc @@ -83,17 +83,17 @@ GLuint createShaderFile(std::string file, int shaderType, size_t Nlights, #define GLSL_VERSION "130" #endif - shaderSrc << "#version " << GLSL_VERSION << "\r\n"; + shaderSrc << "#version " << GLSL_VERSION << "\n"; shaderSrc << "#extension GL_ARB_uniform_buffer_object : enable" - << "\r\n"; + << "\n"; size_t n=defineflags.size(); for(size_t i=0; i < n; ++i) { - shaderSrc << "#define " << defineflags[i] << "\r\n"; + shaderSrc << "#define " << defineflags[i] << "\n"; } - shaderSrc << "const int Nlights=" << Nlights << ";\r\n"; - shaderSrc << "const int Nmaterials=" << Nmaterials << ";\r\n"; + shaderSrc << "#define Nlights " << Nlights << "\n"; + shaderSrc << "const int Nmaterials=" << Nmaterials << ";\n"; if(shaderFile) { shaderSrc << shaderFile.rdbuf(); |