diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-09 13:10:45 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-09 13:10:45 -0700 |
| commit | e8bd9afbe6fab36bb7016cee8c3f3a745e9bd02d (patch) | |
| tree | b1b5dfe66cd2013c33e8141844aff7d5c2479843 /indra/llrender | |
| parent | 93df4ff2fea7378ab5b5ac069c2fec808ec5027b (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
Merge viewer-release 3.6.5 Cocoa
Diffstat (limited to 'indra/llrender')
| -rwxr-xr-x | indra/llrender/llglheaders.h | 5 | ||||
| -rwxr-xr-x | indra/llrender/llrendertarget.cpp | 3 |
2 files changed, 3 insertions, 5 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 3e054f61b2..ed9134c938 100755 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -254,11 +254,14 @@ 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; } |