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

Fixed rendering with OpenGL core profile

Browse Source 
Added (automatic) support of Vertex Arrays Objects (VAO) to fix
rendering with an OpenGL core profile (OpenGL 3.2 require the use of
VAOs)
Added level check to NzImage::GetDepth/Height/Size/Width
Fixed occlussion query support not correctly setted
This commit is contained in:
Lynix
2012-05-31 18:18:28 +02:00
parent 3720967802
commit f4b194f6fe
9 changed files with 220 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Renderer/Renderer.hpp
View File

@@ -8,6 +8,8 @@
#define NAZARA_RENDERER_HPP
#include <Nazara/Prerequesites.hpp>
#include <map>
#include <tuple>
#define NazaraRenderer NzRenderer::Instance()
@@ -45,6 +47,7 @@ enum nzRendererClear
};
class NzColor;
class NzContext;
class NzIndexBuffer;
class NzRenderTarget;
class NzShader;
@@ -86,8 +89,11 @@ class NAZARA_API NzRenderer
static bool IsInitialized();
private:
bool UpdateVertexBuffer();
bool UpdateStates();
typedef std::tuple<const NzContext*, const NzIndexBuffer*, const NzVertexBuffer*, const NzVertexDeclaration*> VAO_Key;
std::map<VAO_Key, unsigned int> m_vaos;
const NzIndexBuffer* m_indexBuffer;
NzRenderTarget* m_target;
NzShader* m_shader;
@@ -95,7 +101,7 @@ class NAZARA_API NzRenderer
const NzVertexBuffer* m_vertexBuffer;
const NzVertexDeclaration* m_vertexDeclaration;
bool m_capabilities[nzRendererCap_Count];
bool m_vertexBufferUpdated;
bool m_statesUpdated;
static NzRenderer* s_instance;
static bool s_initialized;