diff options
| author | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
| commit | ddd9d1396cd378cbcd332d26d8b6b7092716c1bc (patch) | |
| tree | 767a40da9fdd2f3ae0c89b1d6cd5135884c4e8c9 /indra/llrender | |
| parent | 21ab67416d471a90b343052c986478c9dd65ae79 (diff) | |
| parent | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (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; } |