diff options
| author | Richard Linden <none@none> | 2013-09-16 21:12:18 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-16 21:12:18 -0700 |
| commit | fc8c3a4cf7368ad7ee78e817e8c116d09b7377d0 (patch) | |
| tree | 7513b7d0b5651d5de6e1ca4873efdc4689d5245b /indra/llrender | |
| parent | 5f7f84c7acb686659b2bdc9a018b18c2b23db3d0 (diff) | |
| parent | fb82d0c4dbb6f6e3c58cca6ab69d638bda851b34 (diff) | |
merge
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 4b191415a7..d5dba1508b 100755 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -1007,12 +1007,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 a9945f9814..87c67d5039 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; } |