diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-09 17:04:00 -0700 |
| commit | 268d5bd4bd4c9311053808b1f7aa74a85aa038a5 (patch) | |
| tree | e777c21cf2a9e1d2a115c96bff080ebe2d0edb31 /indra/llrender/llshadermgr.cpp | |
| parent | ce417a01c9a5cb0befc68533734d98023a03b96e (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/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"); |