sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'NDK-Refactor' into NDK

Browse Source 
Conflicts:
	examples/HardwareInfo/main.cpp
	include/Nazara/Renderer/Enums.hpp
	include/Nazara/Renderer/GpuQuery.hpp
	include/Nazara/Renderer/OpenGL.hpp
	include/Nazara/Renderer/RenderBuffer.hpp
	include/Nazara/Renderer/RenderTexture.hpp
	include/Nazara/Renderer/Texture.hpp
	src/Nazara/Graphics/AbstractRenderTechnique.cpp
	src/Nazara/Graphics/DeferredRenderTechnique.cpp
	src/Nazara/Graphics/Material.cpp
	src/Nazara/Graphics/SkyboxBackground.cpp
	src/Nazara/Renderer/GpuQuery.cpp
	src/Nazara/Renderer/OpenGL.cpp
	src/Nazara/Renderer/RenderBuffer.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp
	src/Nazara/Renderer/Shader.cpp
	src/Nazara/Renderer/ShaderStage.cpp
	src/Nazara/Renderer/Texture.cpp

Former-commit-id: 2f1c7e9f9766f59ab83d9405856a1898ac4ab48f
This commit is contained in:
Lynix
2015-09-25 23:16:58 +02:00
parent c183102784 df8da275c4
commit eaf1bb3601
613 changed files with 68051 additions and 66125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
src/Nazara/Renderer/RenderBuffer.cpp
View File

@@ -9,122 +9,125 @@
#include <Nazara/Utility/PixelFormat.hpp>
#include <Nazara/Renderer/Debug.hpp>
NzRenderBuffer::NzRenderBuffer() :
m_id(0)
namespace Nz
{
}
NzRenderBuffer::~NzRenderBuffer()
{
OnRenderBufferRelease(this);
Destroy();
}
bool NzRenderBuffer::Create(nzPixelFormat format, unsigned int width, unsigned int height)
{
Destroy();
#if NAZARA_RENDERER_SAFE
if (width == 0 || height == 0)
RenderBuffer::RenderBuffer() :
m_id(0)
{
NazaraError("Invalid size");
return false;
}
if (!NzPixelFormat::IsValid(format))
RenderBuffer::~RenderBuffer()
{
NazaraError("Invalid pixel format");
return false;
}
#endif
OnRenderBufferRelease(this);
NzOpenGL::Format openglFormat;
if (!NzOpenGL::TranslateFormat(format, &openglFormat, NzOpenGL::FormatType_RenderBuffer))
{
NazaraError("Failed to translate pixel format \"" + NzPixelFormat::ToString(format) + "\" into OpenGL format");
return false;
Destroy();
}
GLuint renderBuffer = 0;
glGenRenderbuffers(1, &renderBuffer);
if (!renderBuffer)
bool RenderBuffer::Create(PixelFormatType format, unsigned int width, unsigned int height)
{
NazaraError("Failed to create renderbuffer");
return false;
Destroy();
#if NAZARA_RENDERER_SAFE
if (width == 0 || height == 0)
{
NazaraError("Invalid size");
return false;
}
if (!PixelFormat::IsValid(format))
{
NazaraError("Invalid pixel format");
return false;
}
#endif
OpenGL::Format openglFormat;
if (!OpenGL::TranslateFormat(format, &openglFormat, OpenGL::FormatType_RenderBuffer))
{
NazaraError("Failed to translate pixel format \"" + PixelFormat::ToString(format) + "\" into OpenGL format");
return false;
}
GLuint renderBuffer = 0;
glGenRenderbuffers(1, &renderBuffer);
if (!renderBuffer)
{
NazaraError("Failed to create renderbuffer");
return false;
}
GLint previous;
glGetIntegerv(GL_RENDERBUFFER_BINDING, &previous);
glBindRenderbuffer(GL_RENDERBUFFER, renderBuffer);
glRenderbufferStorage(GL_RENDERBUFFER, openglFormat.internalFormat, width, height);
if (previous != 0)
glBindRenderbuffer(GL_RENDERBUFFER, previous);
m_pixelFormat = format;
m_height = height;
m_id = renderBuffer;
m_width = width;
return true;
}
GLint previous;
glGetIntegerv(GL_RENDERBUFFER_BINDING, &previous);
glBindRenderbuffer(GL_RENDERBUFFER, renderBuffer);
glRenderbufferStorage(GL_RENDERBUFFER, openglFormat.internalFormat, width, height);
if (previous != 0)
glBindRenderbuffer(GL_RENDERBUFFER, previous);
m_pixelFormat = format;
m_height = height;
m_id = renderBuffer;
m_width = width;
return true;
}
void NzRenderBuffer::Destroy()
{
if (m_id)
void RenderBuffer::Destroy()
{
OnRenderBufferDestroy(this);
if (m_id)
{
OnRenderBufferDestroy(this);
NzContext::EnsureContext();
Context::EnsureContext();
GLuint renderBuffer = m_id;
glDeleteRenderbuffers(1, &renderBuffer); // Les Renderbuffers sont partagés entre les contextes: Ne posera pas de problème
m_id = 0;
}
}
unsigned int NzRenderBuffer::GetHeight() const
{
return m_height;
}
nzPixelFormat NzRenderBuffer::GetFormat() const
{
return m_pixelFormat;
}
unsigned int NzRenderBuffer::GetWidth() const
{
return m_width;
}
unsigned int NzRenderBuffer::GetOpenGLID() const
{
return m_id;
}
bool NzRenderBuffer::IsValid() const
{
return m_id != 0;
}
bool NzRenderBuffer::Initialize()
{
if (!NzRenderBufferLibrary::Initialize())
{
NazaraError("Failed to initialise library");
return false;
GLuint renderBuffer = m_id;
glDeleteRenderbuffers(1, &renderBuffer); // Les Renderbuffers sont partagés entre les contextes: Ne posera pas de problème
m_id = 0;
}
}
return true;
}
unsigned int RenderBuffer::GetHeight() const
{
return m_height;
}
void NzRenderBuffer::Uninitialize()
{
NzRenderBufferLibrary::Uninitialize();
}
PixelFormatType RenderBuffer::GetFormat() const
{
return m_pixelFormat;
}
NzRenderBufferLibrary::LibraryMap NzRenderBuffer::s_library;
unsigned int RenderBuffer::GetWidth() const
{
return m_width;
}
unsigned int RenderBuffer::GetOpenGLID() const
{
return m_id;
}
bool RenderBuffer::IsValid() const
{
return m_id != 0;
}
bool RenderBuffer::Initialize()
{
if (!RenderBufferLibrary::Initialize())
{
NazaraError("Failed to initialise library");
return false;
}
return true;
}
void RenderBuffer::Uninitialize()
{
RenderBufferLibrary::Uninitialize();
}
RenderBufferLibrary::LibraryMap RenderBuffer::s_library;
}