diff options
| author | Rye <rye@lindenlab.com> | 2024-12-10 20:21:24 -0500 |
|---|---|---|
| committer | Rye <rye@lindenlab.com> | 2024-12-10 17:24:39 -0800 |
| commit | d17fd56dc42fcd35ef8cf2fe9e4cd7a26ce8ba2a (patch) | |
| tree | 0774b2094802228c7c2ab267d5e33d01b3c1dc75 /indra/llrender | |
| parent | ae9174ffdf340ef12c80547d90d05919957ab512 (diff) | |
Fix crashes from shader load failures under RenderMaxOpenGLVersion 3.1/3.2/3.3 (#3184)
Diffstat (limited to 'indra/llrender')
| -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 47f1032c34..254ead2bd8 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"); |