OcclusionQuery renamed to GpuQuery, and added query modes

Former-commit-id: b36a9b623653ac9b1eb422b09b3781ef46b81aca

include/Nazara/Renderer/Enums.hpp

@@ -51,6 +51,18 @@ enum nzFaceFilling
 	nzFaceFilling_Max = nzFaceFilling_Fill
 };
 
+enum nzGpuQueryMode
+{
+	nzGpuQueryMode_AnySamplesPassed,
+	nzGpuQueryMode_AnySamplesPassedConservative,
+	nzGpuQueryMode_PrimitiveGenerated,
+	nzGpuQueryMode_SamplesPassed,
+	nzGpuQueryMode_TimeElapsed,
+	nzGpuQueryMode_TransformFeedbackPrimitivesWritten,
+
+	nzGpuQueryMode_Max = nzGpuQueryMode_TransformFeedbackPrimitivesWritten
+};
+
 enum nzMatrixType
 {
 	// Matrices de base

include/Nazara/Renderer/GpuQuery.hpp

@@ -4,29 +4,31 @@
 
 #pragma once
 
-#ifndef NAZARA_OCCLUSIONQUERY_HPP
-#define NAZARA_OCCLUSIONQUERY_HPP
+#ifndef NAZARA_GPUQUERY_HPP
+#define NAZARA_GPUQUERY_HPP
 
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/NonCopyable.hpp>
+#include <Nazara/Renderer/Enums.hpp>
 
-class NAZARA_API NzOcclusionQuery : NzNonCopyable
+class NAZARA_API NzGpuQuery : NzNonCopyable
 {
 	public:
-		NzOcclusionQuery();
-		~NzOcclusionQuery();
+		NzGpuQuery();
+		~NzGpuQuery();
 
-		void Begin();
+		void Begin(nzGpuQueryMode mode);
 		void End();
 
 		unsigned int GetResult() const;
 
 		bool IsResultAvailable() const;
 
+		static bool IsModeSupported(nzGpuQueryMode mode);
 		static bool IsSupported();
 
 	private:
 		unsigned int m_id;
 };
 
-#endif // NAZARA_OCCLUSIONQUERY_HPP
+#endif // NAZARA_GPUQUERY_HPP

include/Nazara/Renderer/OpenGL.hpp

@@ -135,6 +135,7 @@ class NAZARA_API NzOpenGL
 		static GLenum FaceCulling[nzFaceCulling_Max+1];
 		static GLenum FaceFilling[nzFaceFilling_Max+1];
 		static GLenum PrimitiveMode[nzPrimitiveMode_Max+1];
+		static GLenum QueryMode[nzGpuQueryMode_Max+1];
 		static GLenum RendererComparison[nzRendererComparison_Max+1];
 		static GLenum RendererParameter[nzRendererParameter_Max+1];
 		static GLenum SamplerWrapMode[nzSamplerWrap_Max+1];