diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-15 12:34:37 +0800 |
| commit | 3316ffb3b571b8730d26d6e8b2ee00fc9cbdf7c0 (patch) | |
| tree | 200cd8497a4fdd782ac4dbfd2ad5fb1632e03275 /indra/llrender/llshadermgr.cpp | |
| parent | d4e433b37af94ee11880deeede74a87a728f4775 (diff) | |
| parent | 5b77436cf0ad749d36e8f0c60077eeb24698d644 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index 7c14a53c78..0885740934 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -580,7 +580,8 @@ GLuint LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_lev } else { - if (type == GL_GEOMETRY_SHADER) + // OpenGL 3.2 had GLSL version 1.50. anything after that the version numbers match. + if (type == GL_GEOMETRY_SHADER || minor_version >= 50) { //set version to 1.50 shader_code_text[shader_code_count++] = strdup("#version 150\n"); |