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

Merge branch 'OpenGL3-upgrade' into NDK

Browse Source 
Conflicts:
	src/Nazara/Graphics/SkyboxBackground.cpp
	src/Nazara/Renderer/RenderTexture.cpp
	src/Nazara/Renderer/Renderer.cpp

Former-commit-id: e8914d4e32a689b7df365dca15a438f10722530c
This commit is contained in:
Lynix
2015-09-24 21:35:43 +02:00
parent b16abf0d09 2462a6f4bf
commit 70ea6912e1
30 changed files with 185 additions and 1136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Renderer/GpuQuery.hpp
View File

@@ -29,7 +29,6 @@ class NAZARA_RENDERER_API NzGpuQuery : NzNonCopyable
unsigned int GetOpenGLID() const;
static bool IsModeSupported(nzGpuQueryMode mode);
static bool IsSupported();
private:
nzGpuQueryMode m_mode;