Merge branch 'OpenGL3-upgrade' into NDK

Conflicts: src/Nazara/Graphics/SkyboxBackground.cpp src/Nazara/Renderer/RenderTexture.cpp src/Nazara/Renderer/Renderer.cpp Former-commit-id: e8914d4e32a689b7df365dca15a438f10722530c
2015-09-24 21:35:43 +02:00
parent b16abf0d09 2462a6f4bf
commit 70ea6912e1
30 changed files with 185 additions and 1136 deletions
--- a/src/Nazara/Renderer/RenderBuffer.cpp
+++ b/src/Nazara/Renderer/RenderBuffer.cpp
@@ -111,11 +111,6 @@ bool NzRenderBuffer::IsValid() const
 	return m_id != 0;
 }

-bool NzRenderBuffer::IsSupported()
-{
-	return NzOpenGL::IsSupported(nzOpenGLExtension_FrameBufferObject);
-}
-
 bool NzRenderBuffer::Initialize()
 {
 	if (!NzRenderBufferLibrary::Initialize())