From fab78c2dffe113b8760a227fc0f97b4ae4b2c8a0 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 30 Apr 2014 18:34:39 +0200 Subject: [PATCH] ogl: add ARB_texture_multisample --- .../OGL/GLExtensions/ARB_texture_multisample.h | 10 ++++++++++ .../VideoBackends/OGL/GLExtensions/GLExtensions.cpp | 12 ++++++++++++ .../VideoBackends/OGL/GLExtensions/GLExtensions.h | 1 + 3 files changed, 23 insertions(+) create mode 100644 Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h new file mode 100644 index 0000000000..3f9829bf64 --- /dev/null +++ b/Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h @@ -0,0 +1,10 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "VideoBackends/OGL/GLExtensions/gl_common.h" + +extern PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample; +extern PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample; +extern PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv; +extern PFNGLSAMPLEMASKIPROC glSampleMaski; diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index 35ed0371f4..77de170411 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -711,6 +711,12 @@ PFNGLGETSYNCIVPROC glGetSynciv; PFNGLISSYNCPROC glIsSync; PFNGLWAITSYNCPROC glWaitSync; +// ARB_texture_multisample +PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample; +PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample; +PFNGLGETMULTISAMPLEFVPROC glGetMultisamplefv; +PFNGLSAMPLEMASKIPROC glSampleMaski; + // ARB_ES2_compatibility PFNGLCLEARDEPTHFPROC glClearDepthf; PFNGLDEPTHRANGEFPROC glDepthRangef; @@ -1490,6 +1496,12 @@ const GLFunc gl_function_array[] = GLFUNC_REQUIRES(glIsSync, "GL_ARB_sync"), GLFUNC_REQUIRES(glWaitSync, "GL_ARB_sync"), + // ARB_texture_multisample + GLFUNC_REQUIRES(glTexImage2DMultisample, "GL_ARB_texture_multisample"), + GLFUNC_REQUIRES(glTexImage3DMultisample, "GL_ARB_texture_multisample"), + GLFUNC_REQUIRES(glGetMultisamplefv, "GL_ARB_texture_multisample"), + GLFUNC_REQUIRES(glSampleMaski, "GL_ARB_texture_multisample"), + // ARB_ES2_compatibility GLFUNC_REQUIRES(glClearDepthf, "GL_ARB_ES2_compatibility"), GLFUNC_REQUIRES(glDepthRangef, "GL_ARB_ES2_compatibility"), diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h index 7b78f722ec..cb52c6ba53 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h @@ -17,6 +17,7 @@ #include "VideoBackends/OGL/GLExtensions/ARB_sample_shading.h" #include "VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h" #include "VideoBackends/OGL/GLExtensions/ARB_sync.h" +#include "VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h" #include "VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h" #include "VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h" #include "VideoBackends/OGL/GLExtensions/ARB_viewport_array.h"