diff options
| author | Aura Linden <aura@lindenlab.com> | 2012-08-17 08:07:15 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2012-08-17 08:07:15 -0700 |
| commit | efdcf045b064335aa180f03bae58916af19e2169 (patch) | |
| tree | 4ca0be04bf1688b728b40be0d6b4221956127918 /indra/llrender/llshadermgr.cpp | |
| parent | 56298eed3d8ae586ab2ae4c7b8dcf53eeede7394 (diff) | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
Merged in from viewer-development.
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
| -rw-r--r-- | indra/llrender/llshadermgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp index a9248d4d73..b6a9a6b653 100644 --- a/indra/llrender/llshadermgr.cpp +++ b/indra/llrender/llshadermgr.cpp @@ -643,7 +643,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade text[count++] = strdup("#define textureCube texture\n"); text[count++] = strdup("#define texture2DLod textureLod\n"); text[count++] = strdup("#define shadow2D(a,b) vec2(texture(a,b))\n"); - + if (major_version > 1 || minor_version >= 40) { //GLSL 1.40 replaces texture2DRect et al with texture text[count++] = strdup("#define texture2DRect texture\n"); |