diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-09 12:43:10 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-09 12:43:10 -0700 |
| commit | 2df58f775fdd1c846ec125a9736d6dd39dab2811 (patch) | |
| tree | cbf35ab02a6b22bf76fcf436d75243df906acbcc /indra/llrender | |
| parent | 38b1975b09c642682bfeb8d6d575ccfbf47ce7e4 (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
Merge viewer-release 3.6.6
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llglheaders.h | 5 | ||||
| -rwxr-xr-x | indra/llrender/llrendertarget.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index dace572953..1bec6d376b 100755 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -1009,12 +1009,7 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); } #endif -#if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1070 #include <OpenGL/gl.h> -#else -#include <AGL/gl.h> -#endif - #endif // LL_MESA / LL_WINDOWS / LL_DARWIN diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index d53c37a847..5ea8387c04 100755 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -252,12 +252,15 @@ bool LLRenderTarget::addColorAttachment(U32 color_fmt) mTex.push_back(tex); mInternalFormat.push_back(color_fmt); +#if !LL_DARWIN if (gDebugGL) { //bind and unbind to validate target bindTarget(); flush(); } - +#endif + + return true; } |