diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-08-13 12:09:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-08-13 12:09:04 -0400 |
| commit | f5e35cbc5362f6b83fcccabf6b22374ca6f08d42 (patch) | |
| tree | de1746f9e607d05b535523a3179ece971edd61ba /indra/llrender/llshadermgr.cpp | |
| parent | 0664cb1512481b9cd9f5ef4bc398c88416b246a9 (diff) | |
| parent | 337976096530729a7d671df68907cd59a7986972 (diff) | |
Merge 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"); |