Merge pull request #1561 from seanpaultaylor/next

Fixed GL_ASSERTS to GP_ASSERTS

gameplay/src/FrameBuffer.cpp

@@ -166,7 +166,7 @@ void FrameBuffer::setRenderTarget(RenderTarget* target, unsigned int index)
 
 void FrameBuffer::setRenderTarget(RenderTarget* target, Texture::CubeFace face, unsigned int index)
 {
-    GL_ASSERT(face >= Texture::POSITIVE_X && face <= Texture::NEGATIVE_Z);
+    GP_ASSERT(face >= Texture::POSITIVE_X && face <= Texture::NEGATIVE_Z);
     GP_ASSERT(!target || (target->getTexture() && target->getTexture()->getType() == Texture::TEXTURE_CUBE));
 
     setRenderTarget(target, index, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face);

gameplay/src/Texture.cpp

@@ -271,9 +271,9 @@ Texture* Texture::create(TextureHandle handle, int width, int height, Format for
 void Texture::setData(const unsigned char* data)
 {
     // Don't work with any compressed or cached textures
-    GL_ASSERT( data );
-    GL_ASSERT( (!_compressed) );
-    GL_ASSERT( (!_cached) );
+    GP_ASSERT( data );
+    GP_ASSERT( (!_compressed) );
+    GP_ASSERT( (!_cached) );
 
     GL_ASSERT( glBindTexture((GLenum)_type, _handle) );