diff options
| author | Karl Stiefvater (qarl) <qarl@lindenlab.com> | 2010-05-07 17:43:12 -0500 |
|---|---|---|
| committer | Karl Stiefvater (qarl) <qarl@lindenlab.com> | 2010-05-07 17:43:12 -0500 |
| commit | 45396901731dc7ecb8ade9e585a43e811f4e4f05 (patch) | |
| tree | 54962d95f0deb8a44afcc1e38ec50ceecd6e0bc4 /indra/llrender | |
| parent | f3b6bc0d4c6361a62c49cb77b5a510326a3f3d93 (diff) | |
revert mac build to 10.4u sdk. remove FBO code from llrendertarget.cpp with #ifdefs.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llrendertarget.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index 3f2558f1f5..d9520b3bf6 100644 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -390,6 +390,8 @@ void LLRenderTarget::flush(BOOL fetch_depth) } else { +#if !LL_DARWIN + stop_glerror(); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); @@ -433,6 +435,7 @@ void LLRenderTarget::flush(BOOL fetch_depth) } } } +#endif glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); } @@ -441,6 +444,7 @@ void LLRenderTarget::flush(BOOL fetch_depth) void LLRenderTarget::copyContents(LLRenderTarget& source, S32 srcX0, S32 srcY0, S32 srcX1, S32 srcY1, S32 dstX0, S32 dstY0, S32 dstX1, S32 dstY1, U32 mask, U32 filter) { +#if !LL_DARWIN gGL.flush(); if (!source.mFBO || !mFBO) { @@ -479,12 +483,14 @@ void LLRenderTarget::copyContents(LLRenderTarget& source, S32 srcX0, S32 srcY0, stop_glerror(); } } +#endif } //static void LLRenderTarget::copyContentsToFramebuffer(LLRenderTarget& source, S32 srcX0, S32 srcY0, S32 srcX1, S32 srcY1, S32 dstX0, S32 dstY0, S32 dstX1, S32 dstY1, U32 mask, U32 filter) { +#if !LL_DARWIN if (!source.mFBO) { llerrs << "Cannot copy framebuffer contents for non FBO render targets." << llendl; @@ -501,6 +507,7 @@ void LLRenderTarget::copyContentsToFramebuffer(LLRenderTarget& source, S32 srcX0 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); stop_glerror(); } +#endif } BOOL LLRenderTarget::isComplete() const @@ -645,6 +652,7 @@ void LLMultisampleBuffer::allocate(U32 resx, U32 resy, U32 color_fmt, BOOL depth void LLMultisampleBuffer::addColorAttachment(U32 color_fmt) { +#if !LL_DARWIN if (color_fmt == 0) { return; @@ -685,10 +693,12 @@ void LLMultisampleBuffer::addColorAttachment(U32 color_fmt) } mTex.push_back(tex); +#endif } void LLMultisampleBuffer::allocateDepth() { +#if !LL_DARWIN glGenRenderbuffersEXT(1, (GLuint* ) &mDepth); glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, mDepth); if (mStencil) @@ -699,5 +709,6 @@ void LLMultisampleBuffer::allocateDepth() { glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER_EXT, mSamples, GL_DEPTH_COMPONENT16_ARB, mResX, mResY); } +#endif } |