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

Added NzTexture

Browse Source 
Added levelCount parameter to NzImageParams
Added NzPixelFormat::HasAlpha
Reformatted OpenGL debug messages
This commit is contained in:
Lynix
2012-06-05 10:54:06 +02:00
parent 49353cb636
commit a176648265
19 changed files with 1807 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Nazara/Renderer/Renderer.cpp
View File

@@ -30,7 +30,8 @@ namespace
4 // nzElementUsage_TexCoord
};
const GLenum openglPrimitive[] = {
const GLenum openglPrimitive[] =
{
GL_LINES, // nzPrimitiveType_LineList,
GL_LINE_STRIP, // nzPrimitiveType_LineStrip,
GL_POINTS, // nzPrimitiveType_PointList,
@@ -310,6 +311,12 @@ bool NzRenderer::SetShader(NzShader* shader)
if (shader == m_shader)
return true;
if (m_shader)
{
m_shader->m_impl->Unbind();
m_shader = nullptr;
}
if (shader)
{
#if NAZARA_RENDERER_SAFE
@@ -328,11 +335,6 @@ bool NzRenderer::SetShader(NzShader* shader)
m_shader = shader;
}
else if (m_shader)
{
m_shader->m_impl->Unbind();
m_shader = nullptr;
}
return true;
}
@@ -408,7 +410,7 @@ void NzRenderer::Uninitialize()
// Libération des VAOs
for (auto it = m_vaos.begin(); it != m_vaos.end(); ++it)
{
GLuint vao = it->second;
GLuint vao = static_cast<GLuint>(it->second);
glDeleteVertexArrays(1, &vao);
}