The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 15:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

[GLExtensions] Add support for NV_occlusion_query_samples.

Browse Source
This commit is contained in:
Ryan Houdek 2015-02-21 16:57:41 -06:00
parent e8f37bc3fe
commit a5b4ac6faa
5 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
View File

@ -776,6 +776,15 @@ PFNGLPUSHDEBUGGROUPPROC glPushDebugGroup;
PFNGLBUFFERSTORAGEPROC glBufferStorage; PFNGLBUFFERSTORAGEPROC glBufferStorage;
PFNGLNAMEDBUFFERSTORAGEEXTPROC glNamedBufferStorageEXT; PFNGLNAMEDBUFFERSTORAGEEXTPROC glNamedBufferStorageEXT;
// GL_NV_occlusion_query_samples
PFNGLGENOCCLUSIONQUERIESNVPROC glGenOcclusionQueriesNV;
PFNGLDELETEOCCLUSIONQUERIESNVPROC glDeleteOcclusionQueriesNV;
PFNGLISOCCLUSIONQUERYNVPROC glIsOcclusionQueryNV;
PFNGLBEGINOCCLUSIONQUERYNVPROC glBeginOcclusionQueryNV;
PFNGLENDOCCLUSIONQUERYNVPROC glEndOcclusionQueryNV;
PFNGLGETOCCLUSIONQUERYIVNVPROC glGetOcclusionQueryivNV;
PFNGLGETOCCLUSIONQUERYUIVNVPROC glGetOcclusionQueryuivNV;
// Creates a GLFunc object that requires a feature // Creates a GLFunc object that requires a feature
#define GLFUNC_REQUIRES(x, y) { (void**)&x, #x, y } #define GLFUNC_REQUIRES(x, y) { (void**)&x, #x, y }
// Creates a GLFunc object with a different function suffix // Creates a GLFunc object with a different function suffix
@ -1254,6 +1263,15 @@ const GLFunc gl_function_array[] =
// EXT_geometry_shader // EXT_geometry_shader
GLFUNC_SUFFIX(glFramebufferTexture, EXT, "GL_EXT_geometry_shader !VERSION_3_2"), GLFUNC_SUFFIX(glFramebufferTexture, EXT, "GL_EXT_geometry_shader !VERSION_3_2"),
// NV_occlusion_query_samples
GLFUNC_REQUIRES(glGenOcclusionQueriesNV, "GL_NV_occlusion_query_samples"),
GLFUNC_REQUIRES(glDeleteOcclusionQueriesNV, "GL_NV_occlusion_query_samples"),
GLFUNC_REQUIRES(glIsOcclusionQueryNV, "GL_NV_occlusion_query_samples"),
GLFUNC_REQUIRES(glBeginOcclusionQueryNV, "GL_NV_occlusion_query_samples"),
GLFUNC_REQUIRES(glEndOcclusionQueryNV, "GL_NV_occlusion_query_samples"),
GLFUNC_REQUIRES(glGetOcclusionQueryivNV, "GL_NV_occlusion_query_samples"),
GLFUNC_REQUIRES(glGetOcclusionQueryuivNV, "GL_NV_occlusion_query_samples"),
// gl_1_1 // gl_1_1
// OpenGL 1.1 is at the end due to a bug in Android's EGL stack. // OpenGL 1.1 is at the end due to a bug in Android's EGL stack.
// eglGetProcAddress can only return a finite amount of function pointers // eglGetProcAddress can only return a finite amount of function pointers

1
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
View File

@ -31,6 +31,7 @@
#include "VideoBackends/OGL/GLExtensions/gl_3_1.h" #include "VideoBackends/OGL/GLExtensions/gl_3_1.h"
#include "VideoBackends/OGL/GLExtensions/gl_3_2.h" #include "VideoBackends/OGL/GLExtensions/gl_3_2.h"
#include "VideoBackends/OGL/GLExtensions/KHR_debug.h" #include "VideoBackends/OGL/GLExtensions/KHR_debug.h"
#include "VideoBackends/OGL/GLExtensions/NV_occlusion_query_samples.h"
#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h" #include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h"
namespace GLExtensions namespace GLExtensions

13
Source/Core/VideoBackends/OGL/GLExtensions/NV_occlusion_query_samples.h Normal file
View File

@ -0,0 +1,13 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLGENOCCLUSIONQUERIESNVPROC glGenOcclusionQueriesNV;
extern PFNGLDELETEOCCLUSIONQUERIESNVPROC glDeleteOcclusionQueriesNV;
extern PFNGLISOCCLUSIONQUERYNVPROC glIsOcclusionQueryNV;
extern PFNGLBEGINOCCLUSIONQUERYNVPROC glBeginOcclusionQueryNV;
extern PFNGLENDOCCLUSIONQUERYNVPROC glEndOcclusionQueryNV;
extern PFNGLGETOCCLUSIONQUERYIVNVPROC glGetOcclusionQueryivNV;
extern PFNGLGETOCCLUSIONQUERYUIVNVPROC glGetOcclusionQueryuivNV;

1
Source/Core/VideoBackends/OGL/OGL.vcxproj
View File

@ -83,6 +83,7 @@
<ClInclude Include="GLExtensions\gl_3_2.h" /> <ClInclude Include="GLExtensions\gl_3_2.h" />
<ClInclude Include="GLExtensions\gl_common.h" /> <ClInclude Include="GLExtensions\gl_common.h" />
<ClInclude Include="GLExtensions\KHR_debug.h" /> <ClInclude Include="GLExtensions\KHR_debug.h" />
<ClInclude Include="GLExtensions\NV_occlusion_query_samples.h" />
<ClInclude Include="GLExtensions\NV_primitive_restart.h" /> <ClInclude Include="GLExtensions\NV_primitive_restart.h" />
<ClInclude Include="GLInterface\WGL.h" /> <ClInclude Include="GLInterface\WGL.h" />
<ClInclude Include="GLUtil.h" /> <ClInclude Include="GLUtil.h" />

3
Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
View File

@ -187,6 +187,9 @@
<ClInclude Include="GLExtensions\GLExtensions.h"> <ClInclude Include="GLExtensions\GLExtensions.h">
<Filter>GLExtensions</Filter> <Filter>GLExtensions</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GLExtensions\NV_occlusion_query_samples.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\NV_primitive_restart.h"> <ClInclude Include="GLExtensions\NV_primitive_restart.h">
<Filter>GLExtensions</Filter> <Filter>GLExtensions</Filter>
</ClInclude> </ClInclude>