diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-27 10:34:21 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-27 10:34:21 -0500 |
| commit | 5e20cee4b474c20f1a43b46658918be9e05820b0 (patch) | |
| tree | 0d4da02d973fffb269bc3154308caba35b8032e8 /indra | |
| parent | ad4b559f9fb7c39a090898207c46d4c77d3560bf (diff) | |
SH-1897 Don't use GLSL 1.20 unless the GL version is >= 2.1f
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index b4e7aaa9b4..751b250d96 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -462,7 +462,11 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade GLcharARB* text[1024]; GLuint count = 0; - if (gGLManager.mGLVersion < 3.f) + if (gGLManager.mGLVersion < 2.1f) + { + text[count++] = strdup("#version 110\n"); + } + else if (gGLManager.mGLVersion < 3.f) { //set version to 1.20 text[count++] = strdup("#version 120\n"); |