ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ogl: drop NV_framebuffer_multisample_coverage

This commit is contained in:
degasus 2014-04-30 18:15:29 +02:00
parent afea848e3b
commit 775858b6bc
5 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -744,9 +744,6 @@ PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glDrawRangeElementsBaseVertex; PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC glDrawRangeElementsBaseVertex;
PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glMultiDrawElementsBaseVertex; PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC glMultiDrawElementsBaseVertex;
// NV_framebuffer_multisample_coverage
PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC glRenderbufferStorageMultisampleCoverageNV;
// ARB_sample_shading // ARB_sample_shading
PFNGLMINSAMPLESHADINGARBPROC glMinSampleShadingARB; PFNGLMINSAMPLESHADINGARBPROC glMinSampleShadingARB;
@ -1526,9 +1523,6 @@ const GLFunc gl_function_array[] =
GLFUNC_REQUIRES(glDrawRangeElementsBaseVertex, "GL_ARB_draw_elements_base_vertex"), GLFUNC_REQUIRES(glDrawRangeElementsBaseVertex, "GL_ARB_draw_elements_base_vertex"),
GLFUNC_REQUIRES(glMultiDrawElementsBaseVertex, "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 // ARB_sample_shading
GLFUNC_REQUIRES(glMinSampleShadingARB, "GL_ARB_sample_shading"), GLFUNC_REQUIRES(glMinSampleShadingARB, "GL_ARB_sample_shading"),

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

@ -30,7 +30,6 @@
#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_framebuffer_multisample_coverage.h"
#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h" #include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h"
namespace GLExtensions namespace GLExtensions

15
Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h
View File

@ -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;

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

@ -90,7 +90,6 @@
<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_framebuffer_multisample_coverage.h" />
<ClInclude Include="GLExtensions\NV_primitive_restart.h" /> <ClInclude Include="GLExtensions\NV_primitive_restart.h" />
<ClInclude Include="GLUtil.h" /> <ClInclude Include="GLUtil.h" />
<ClInclude Include="main.h" /> <ClInclude Include="main.h" />
@ -124,4 +123,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

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

@ -174,9 +174,6 @@
<ClInclude Include="GLExtensions\GLExtensions.h"> <ClInclude Include="GLExtensions\GLExtensions.h">
<Filter>GLExtensions</Filter> <Filter>GLExtensions</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="GLExtensions\NV_framebuffer_multisample_coverage.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>
@ -187,4 +184,4 @@
<ItemGroup> <ItemGroup>
<Text Include="CMakeLists.txt" /> <Text Include="CMakeLists.txt" />
</ItemGroup> </ItemGroup>
</Project> </Project>