Merge pull request #1 from alexey-lysiuk/macos_build_fix

Fixed compilation on macOS
This commit is contained in:
Rachael Alexanderson 2016-09-25 13:11:16 -04:00 committed by GitHub
commit 7e19a0a644

View file

@ -1101,7 +1101,7 @@ void CocoaFrameBuffer::Flip()
#endif // __LITTLE_ENDIAN__
if (IsBgra())
glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, Width, Height, 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE, m_pixelBuffer);
glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, Width, Height, 0, GL_BGRA, GL_UNSIGNED_BYTE, m_pixelBuffer);
else
glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, Width, Height, 0, format, GL_UNSIGNED_BYTE, m_pixelBuffer);
@ -1127,7 +1127,7 @@ void CocoaFrameBuffer::Flip()
SDLGLFB::SDLGLFB(void*, const int width, const int height, int, int, const bool fullscreen)
: DFrameBuffer(width, height)
: DFrameBuffer(width, height, false)
, m_lock(-1)
, m_isUpdatePending(false)
{