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

The OpenGL wrapper now handles context change

Browse Source 
Fixed some bugs
Thanks to Raakz


Former-commit-id: f156ba7aa3307cccd83c9c02987dadad02cd8185
This commit is contained in:
Lynix
2013-06-21 01:28:11 +02:00
parent cca920e597
commit 00c2e824d1
7 changed files with 208 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Renderer/Context.hpp
View File

@@ -32,13 +32,13 @@ class NAZARA_API NzContext : public NzResource
const NzContextParameters& GetParameters() const;
bool IsActive() const;
bool SetActive(bool active) const;
bool SetActive(bool active);
void SwapBuffers();
static bool EnsureContext();
static const NzContext* GetCurrent();
static const NzContext* GetReference();
static const NzContext* GetThreadContext();
static NzContext* GetCurrent();
static NzContext* GetReference();
static NzContext* GetThreadContext();
static bool Initialize();
static void Uninitialize();

7
include/Nazara/Renderer/OpenGL.hpp
View File

@@ -44,10 +44,13 @@ enum nzOpenGLExtension
nzOpenGLExtension_Max = nzOpenGLExtension_VertexArrayObjects
};
class NzContext;
using NzOpenGLFunc = void (*)();
class NAZARA_API NzOpenGL
{
friend NzContext;
public:
enum FormatType
{
@@ -120,6 +123,10 @@ class NAZARA_API NzOpenGL
static GLenum TextureTarget[nzImageType_Max+1];
static GLenum TextureTargetBinding[nzImageType_Max+1];
static GLenum TextureTargetProxy[nzImageType_Max+1];
private:
static void OnContextDestruction(NzContext* context);
static void OnContextChange(NzContext* newContext);
};
NAZARA_API extern PFNGLACTIVETEXTUREPROC glActiveTexture;