diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-08 15:52:54 -0700 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-08-08 15:52:54 -0700 |
| commit | 5ee461ab19ac86ef9712ad33435b821f9afe340c (patch) | |
| tree | 44a7aa3deeb30264dc181271c663cb0c08cb1bc3 /indra/llrender/llshadermgr.cpp | |
| parent | 225ac5c487548ba7e62f3e15f1b941baba3a433c (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
merge
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"); |