From 775858b6bc8a28fece97c65177f7314583ea6ff0 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 30 Apr 2014 18:15:29 +0200 Subject: [PATCH] ogl: drop NV_framebuffer_multisample_coverage --- .../OGL/GLExtensions/GLExtensions.cpp | 6 ------ .../VideoBackends/OGL/GLExtensions/GLExtensions.h | 1 - .../NV_framebuffer_multisample_coverage.h | 15 --------------- Source/Core/VideoBackends/OGL/OGL.vcxproj | 3 +-- Source/Core/VideoBackends/OGL/OGL.vcxproj.filters | 5 +---- 5 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index f6fd98a48a..35ed0371f4 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -744,9 +744,6 @@ PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex; PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glDrawRangeElementsBaseVertex; PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glMultiDrawElementsBaseVertex; -// NV_framebuffer_multisample_coverage -PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC glRenderbufferStorageMultisampleCoverageNV; - // ARB_sample_shading PFNGLMINSAMPLESHADINGARBPROC glMinSampleShadingARB; @@ -1526,9 +1523,6 @@ const GLFunc gl_function_array[] = GLFUNC_REQUIRES(glDrawRangeElementsBaseVertex, "GL_ARB_draw_elements_base_vertex"), GLFUNC_REQUIRES(glMultiDrawElementsBaseVertex, "GL_ARB_draw_elements_base_vertex"), - // NV_framebuffer_multisample_coverage - GLFUNC_REQUIRES(glRenderbufferStorageMultisampleCoverageNV, "GL_NV_framebuffer_multisample_coverage"), - // ARB_sample_shading GLFUNC_REQUIRES(glMinSampleShadingARB, "GL_ARB_sample_shading"), diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h index b7621ae78a..7b78f722ec 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h @@ -30,7 +30,6 @@ #include "VideoBackends/OGL/GLExtensions/gl_3_1.h" #include "VideoBackends/OGL/GLExtensions/gl_3_2.h" #include "VideoBackends/OGL/GLExtensions/KHR_debug.h" -#include "VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h" #include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h" namespace GLExtensions diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h b/Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h deleted file mode 100644 index 7a1747d70e..0000000000 --- a/Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "VideoBackends/OGL/GLExtensions/gl_common.h" - -#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB -#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 -#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 -#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 - -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); - -extern PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC glRenderbufferStorageMultisampleCoverageNV; - diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj index ce1203fd42..cb9cd336db 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj @@ -90,7 +90,6 @@ - @@ -124,4 +123,4 @@ - \ No newline at end of file + diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters index 1fe66071f9..7d962fa9e0 100644 --- a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters +++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters @@ -174,9 +174,6 @@ GLExtensions - - GLExtensions - GLExtensions @@ -187,4 +184,4 @@ - \ No newline at end of file +