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

Move GL interface code out of the OpenGL video backend.

This commit is contained in:
Scott Mansell 2015-09-19 04:40:00 +12:00
parent 3df83e5717
commit 95f3c956a8
83 changed files with 367 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Core/Common/CMakeLists.txt
View File

@ -58,5 +58,40 @@ if(NOT APPLE AND NOT ANDROID)
set(LIBS ${LIBS} rt)
endif()
# OpenGL Interface
set(SRCS ${SRCS}
GL/GLUtil.cpp
GL/GLExtensions/GLExtensions.cpp
GL/GLInterface/GLInterface.cpp)
if(USE_EGL)
set(SRCS ${SRCS} GL/GLInterface/EGL.cpp)
if(ANDROID)
set(SRCS ${SRCS} GL/GLInterface/EGLAndroid.cpp)
elseif(USE_X11)
set(SRCS ${SRCS} GL/GLInterface/EGLX11.cpp)
endif()
set(LIBS ${LIBS} EGL)
endif()
if(WIN32)
set(SRCS ${SRCS} GL/GLInterface/WGL.cpp)
elseif(APPLE)
set(SRCS ${SRCS} GL/GLInterface/AGL.cpp)
elseif(USE_X11)
if (NOT USE_EGL)
set(SRCS ${SRCS} GL/GLInterface/GLX.cpp)
# GLX has a hard dependency on libGL.
# Make sure to link to it if using GLX.
set(LIBS ${LIBS} ${OPENGL_LIBRARIES})
endif()
set(SRCS ${SRCS} GL/GLInterface/X11_Util.cpp)
set(LIBS ${LIBS} ${XRANDR_LIBRARIES})
endif()
if(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD)
set(LIBS ${LIBS} dl)
endif()
add_dolphin_library(common "${SRCS}" "${LIBS}")
add_executable(traversal_server TraversalServer.cpp)

39
Source/Core/Common/Common.vcxproj
View File

@ -61,6 +61,41 @@
<ClInclude Include="Flag.h" />
<ClInclude Include="FPURoundMode.h" />
<ClInclude Include="GekkoDisassembler.h" />
<ClInclude Include="GL\GLExtensions\ARB_blend_func_extended.h" />
<ClInclude Include="GL\GLExtensions\ARB_buffer_storage.h" />
<ClInclude Include="GL\GLExtensions\ARB_clip_control.h" />
<ClInclude Include="GL\GLExtensions\ARB_copy_image.h" />
<ClInclude Include="GL\GLExtensions\ARB_debug_output.h" />
<ClInclude Include="GL\GLExtensions\ARB_draw_elements_base_vertex.h" />
<ClInclude Include="GL\GLExtensions\ARB_ES2_compatibility.h" />
<ClInclude Include="GL\GLExtensions\ARB_framebuffer_object.h" />
<ClInclude Include="GL\GLExtensions\ARB_get_program_binary.h" />
<ClInclude Include="GL\GLExtensions\ARB_map_buffer_range.h" />
<ClInclude Include="GL\GLExtensions\ARB_sampler_objects.h" />
<ClInclude Include="GL\GLExtensions\ARB_sample_shading.h" />
<ClInclude Include="GL\GLExtensions\ARB_sync.h" />
<ClInclude Include="GL\GLExtensions\ARB_texture_multisample.h" />
<ClInclude Include="GL\GLExtensions\ARB_texture_storage_multisample.h" />
<ClInclude Include="GL\GLExtensions\ARB_uniform_buffer_object.h" />
<ClInclude Include="GL\GLExtensions\ARB_vertex_array_object.h" />
<ClInclude Include="GL\GLExtensions\ARB_viewport_array.h" />
<ClInclude Include="GL\GLExtensions\GLExtensions.h" />
<ClInclude Include="GL\GLExtensions\gl_1_1.h" />
<ClInclude Include="GL\GLExtensions\gl_1_2.h" />
<ClInclude Include="GL\GLExtensions\gl_1_3.h" />
<ClInclude Include="GL\GLExtensions\gl_1_4.h" />
<ClInclude Include="GL\GLExtensions\gl_1_5.h" />
<ClInclude Include="GL\GLExtensions\gl_2_0.h" />
<ClInclude Include="GL\GLExtensions\gl_3_0.h" />
<ClInclude Include="GL\GLExtensions\gl_3_1.h" />
<ClInclude Include="GL\GLExtensions\gl_3_2.h" />
<ClInclude Include="GL\GLExtensions\gl_common.h" />
<ClInclude Include="GL\GLExtensions\KHR_debug.h" />
<ClInclude Include="GL\GLExtensions\NV_occlusion_query_samples.h" />
<ClInclude Include="GL\GLExtensions\NV_primitive_restart.h" />
<ClInclude Include="GL\GLInterfaceBase.h" />
<ClInclude Include="GL\GLInterface\WGL.h" />
<ClInclude Include="GL\GLUtil.h" />
<ClInclude Include="Hash.h" />
<ClInclude Include="IniFile.h" />
<ClInclude Include="JitRegister.h" />
@ -99,6 +134,10 @@
<ClCompile Include="FileSearch.cpp" />
<ClCompile Include="FileUtil.cpp" />
<ClCompile Include="GekkoDisassembler.cpp" />
<ClCompile Include="GL\GLExtensions\GLExtensions.cpp" />
<ClCompile Include="GL\GLInterface\GLInterface.cpp" />
<ClCompile Include="GL\GLInterface\WGL.cpp" />
<ClCompile Include="GL\GLUtil.cpp" />
<ClCompile Include="Hash.cpp" />
<ClCompile Include="IniFile.cpp" />
<ClCompile Include="JitRegister.cpp" />

126
Source/Core/Common/Common.vcxproj.filters
View File

@ -7,6 +7,15 @@
<Filter Include="Logging">
<UniqueIdentifier>{c54973ce-5723-491c-ac23-41cea3565b05}</UniqueIdentifier>
</Filter>
<Filter Include="GL">
<UniqueIdentifier>{3bcf0d33-06a7-4eb6-bf2d-bc5273f551a3}</UniqueIdentifier>
</Filter>
<Filter Include="GL\GLInterface">
<UniqueIdentifier>{79bb235a-a0ea-42e2-af6e-532088e5e253}</UniqueIdentifier>
</Filter>
<Filter Include="GL\GLExtensions">
<UniqueIdentifier>{c1d6f1fe-5ec5-406d-84f2-ed64d733d2c3}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Atomic.h" />
@ -74,6 +83,111 @@
<ClInclude Include="JitRegister.h" />
<ClInclude Include="TraversalClient.h" />
<ClInclude Include="TraversalProto.h" />
<ClInclude Include="GL\GLUtil.h">
<Filter>GL</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_blend_func_extended.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_buffer_storage.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_clip_control.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_copy_image.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_debug_output.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_draw_elements_base_vertex.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_ES2_compatibility.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_framebuffer_object.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_get_program_binary.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_map_buffer_range.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_sample_shading.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_sampler_objects.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_sync.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_texture_multisample.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_texture_storage_multisample.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_uniform_buffer_object.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_vertex_array_object.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\ARB_viewport_array.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_1_1.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_1_2.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_1_3.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_1_4.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_1_5.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_2_0.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_3_0.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_3_1.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_3_2.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\gl_common.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\GLExtensions.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\KHR_debug.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\NV_occlusion_query_samples.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLExtensions\NV_primitive_restart.h">
<Filter>GL\GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GL\GLInterface\WGL.h">
<Filter>GL\GLInterface</Filter>
</ClInclude>
<ClInclude Include="GL\GLInterfaceBase.h">
<Filter>GL\GLInterface</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="BreakPoints.cpp" />
@ -122,6 +236,18 @@
<ClCompile Include="Logging\ConsoleListenerWin.cpp">
<Filter>Logging</Filter>
</ClCompile>
<ClCompile Include="GL\GLUtil.cpp">
<Filter>GL</Filter>
</ClCompile>
<ClCompile Include="GL\GLExtensions\GLExtensions.cpp">
<Filter>GL\GLExtensions</Filter>
</ClCompile>
<ClCompile Include="GL\GLInterface\WGL.cpp">
<Filter>GL\GLInterface</Filter>
</ClCompile>
<ClCompile Include="GL\GLInterface\GLInterface.cpp">
<Filter>GL\GLInterface</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h → Source/Core/Common/GL/GLExtensions/ARB_ES2_compatibility.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLCLEARDEPTHFPROC glClearDepthf;
extern PFNGLDEPTHRANGEFPROC glDepthRangef;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h → Source/Core/Common/GL/GLExtensions/ARB_blend_func_extended.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glBindFragDataLocationIndexed;
extern PFNGLGETFRAGDATAINDEXPROC glGetFragDataIndex;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h → Source/Core/Common/GL/GLExtensions/ARB_buffer_storage.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLBUFFERSTORAGEPROC glBufferStorage;
extern PFNGLNAMEDBUFFERSTORAGEEXTPROC glNamedBufferStorageEXT;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_clip_control.h → Source/Core/Common/GL/GLExtensions/ARB_clip_control.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLCLIPCONTROLPROC glClipControl;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_copy_image.h → Source/Core/Common/GL/GLExtensions/ARB_copy_image.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h → Source/Core/Common/GL/GLExtensions/ARB_debug_output.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
extern PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h → Source/Core/Common/GL/GLExtensions/ARB_draw_elements_base_vertex.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h → Source/Core/Common/GL/GLExtensions/ARB_framebuffer_object.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
extern PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h → Source/Core/Common/GL/GLExtensions/ARB_get_program_binary.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
extern PFNGLPROGRAMBINARYPROC glProgramBinary;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h → Source/Core/Common/GL/GLExtensions/ARB_map_buffer_range.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h → Source/Core/Common/GL/GLExtensions/ARB_sample_shading.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLMINSAMPLESHADINGARBPROC glMinSampleShading;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h → Source/Core/Common/GL/GLExtensions/ARB_sampler_objects.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLBINDSAMPLERPROC glBindSampler;
extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h → Source/Core/Common/GL/GLExtensions/ARB_sync.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
extern PFNGLDELETESYNCPROC glDeleteSync;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h → Source/Core/Common/GL/GLExtensions/ARB_texture_multisample.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLTEXIMAGE2DMULTISAMPLEPROC glTexImage2DMultisample;
extern PFNGLTEXIMAGE3DMULTISAMPLEPROC glTexImage3DMultisample;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_storage_multisample.h → Source/Core/Common/GL/GLExtensions/ARB_texture_storage_multisample.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
typedef void (*PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
typedef void (*PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h → Source/Core/Common/GL/GLExtensions/ARB_uniform_buffer_object.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h → Source/Core/Common/GL/GLExtensions/ARB_vertex_array_object.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h → Source/Core/Common/GL/GLExtensions/ARB_viewport_array.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLDEPTHRANGEARRAYVPROC glDepthRangeArrayv;
extern PFNGLDEPTHRANGEINDEXEDPROC glDepthRangeIndexed;

5
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp → Source/Core/Common/GL/GLExtensions/GLExtensions.cpp
View File

@ -5,9 +5,10 @@
#include <sstream>
#include <unordered_map>
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLExtensions/GLExtensions.h"
#include "Common/Logging/Log.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
#if defined(__linux__) || defined(__APPLE__)
#include <dlfcn.h>

51
Source/Core/Common/GL/GLExtensions/GLExtensions.h Normal file
View File

@ -0,0 +1,51 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <string>
#include "Common/CommonTypes.h"
#include "Common/GL/GLExtensions/ARB_blend_func_extended.h"
#include "Common/GL/GLExtensions/ARB_buffer_storage.h"
#include "Common/GL/GLExtensions/ARB_clip_control.h"
#include "Common/GL/GLExtensions/ARB_copy_image.h"
#include "Common/GL/GLExtensions/ARB_debug_output.h"
#include "Common/GL/GLExtensions/ARB_draw_elements_base_vertex.h"
#include "Common/GL/GLExtensions/ARB_ES2_compatibility.h"
#include "Common/GL/GLExtensions/ARB_framebuffer_object.h"
#include "Common/GL/GLExtensions/ARB_get_program_binary.h"
#include "Common/GL/GLExtensions/ARB_map_buffer_range.h"
#include "Common/GL/GLExtensions/ARB_sample_shading.h"
#include "Common/GL/GLExtensions/ARB_sampler_objects.h"
#include "Common/GL/GLExtensions/ARB_sync.h"
#include "Common/GL/GLExtensions/ARB_texture_multisample.h"
#include "Common/GL/GLExtensions/ARB_texture_storage_multisample.h"
#include "Common/GL/GLExtensions/ARB_uniform_buffer_object.h"
#include "Common/GL/GLExtensions/ARB_vertex_array_object.h"
#include "Common/GL/GLExtensions/ARB_viewport_array.h"
#include "Common/GL/GLExtensions/gl_1_1.h"
#include "Common/GL/GLExtensions/gl_1_2.h"
#include "Common/GL/GLExtensions/gl_1_3.h"
#include "Common/GL/GLExtensions/gl_1_4.h"
#include "Common/GL/GLExtensions/gl_1_5.h"
#include "Common/GL/GLExtensions/gl_2_0.h"
#include "Common/GL/GLExtensions/gl_3_0.h"
#include "Common/GL/GLExtensions/gl_3_1.h"
#include "Common/GL/GLExtensions/gl_3_2.h"
#include "Common/GL/GLExtensions/KHR_debug.h"
#include "Common/GL/GLExtensions/NV_occlusion_query_samples.h"
#include "Common/GL/GLExtensions/NV_primitive_restart.h"
namespace GLExtensions
{
// Initializes the interface
bool Init();
// Function for checking if the hardware supports an extension
// example: if (GLExtensions::Supports("GL_ARB_multi_map"))
bool Supports(const std::string& name);
// Returns OpenGL version in format 430
u32 Version();
}

2
Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h → Source/Core/Common/GL/GLExtensions/KHR_debug.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
#ifndef GL_VERSION_4_3

2
Source/Core/VideoBackends/OGL/GLExtensions/NV_occlusion_query_samples.h → Source/Core/Common/GL/GLExtensions/NV_occlusion_query_samples.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLGENOCCLUSIONQUERIESNVPROC glGenOcclusionQueriesNV;
extern PFNGLDELETEOCCLUSIONQUERIESNVPROC glDeleteOcclusionQueriesNV;

2
Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h → Source/Core/Common/GL/GLExtensions/NV_primitive_restart.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
#define GL_PRIMITIVE_RESTART_NV 0x8558
#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h → Source/Core/Common/GL/GLExtensions/gl_1_1.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
typedef void (GLAPIENTRY * PFNGLCLEARINDEXPROC) ( GLfloat c );
typedef void (GLAPIENTRY * PFNGLCLEARCOLORPROC) ( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h → Source/Core/Common/GL/GLExtensions/gl_1_2.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D;
extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h → Source/Core/Common/GL/GLExtensions/gl_1_3.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLACTIVETEXTUREARBPROC glActiveTexture;
extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTexture;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h → Source/Core/Common/GL/GLExtensions/gl_1_4.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
// These two are provided by ARB_imaging as well
extern PFNGLBLENDCOLORPROC glBlendColor;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h → Source/Core/Common/GL/GLExtensions/gl_1_5.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLBEGINQUERYPROC glBeginQuery;
extern PFNGLBINDBUFFERPROC glBindBuffer;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h → Source/Core/Common/GL/GLExtensions/gl_2_0.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLATTACHSHADERPROC glAttachShader;
extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h → Source/Core/Common/GL/GLExtensions/gl_3_0.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLBEGINCONDITIONALRENDERPROC glBeginConditionalRender;
extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h → Source/Core/Common/GL/GLExtensions/gl_3_1.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h → Source/Core/Common/GL/GLExtensions/gl_3_2.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#include "Common/GL/GLExtensions/gl_common.h"
extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
extern PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v;

0
Source/Core/VideoBackends/OGL/GLExtensions/gl_common.h → Source/Core/Common/GL/GLExtensions/gl_common.h
View File

2
Source/Core/VideoBackends/OGL/GLInterface/AGL.cpp → Source/Core/Common/GL/GLInterface/AGL.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLInterface/AGL.h"
#include "Common/GL/GLInterface/AGL.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VertexShaderManager.h"

2
Source/Core/VideoBackends/OGL/GLInterface/AGL.h → Source/Core/Common/GL/GLInterface/AGL.h
View File

@ -8,7 +8,7 @@
#import <AppKit/AppKit.h>
#endif
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "Common/GL/GLInterfaceBase.h"
class cInterfaceAGL : public cInterfaceBase
{

4
Source/Core/VideoBackends/OGL/GLInterface/EGL.cpp → Source/Core/Common/GL/GLInterface/EGL.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLInterface/EGL.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLInterface/EGL.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/RenderBase.h"

2
Source/Core/VideoBackends/OGL/GLInterface/EGL.h → Source/Core/Common/GL/GLInterface/EGL.h
View File

@ -7,8 +7,8 @@
#include <string>
#include <EGL/egl.h>
#include "Common/GL/GLInterfaceBase.h"
#include "Core/ConfigManager.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
class cInterfaceEGL : public cInterfaceBase
{

2
Source/Core/VideoBackends/OGL/GLInterface/EGLAndroid.cpp → Source/Core/Common/GL/GLInterface/EGLAndroid.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Common/GL/GLInterface/EGLAndroid.h"
#include "Core/Host.h"
#include "VideoBackends/OGL/GLInterface/EGLAndroid.h"
EGLDisplay cInterfaceEGLAndroid::OpenDisplay()
{

2
Source/Core/VideoBackends/OGL/GLInterface/EGLAndroid.h → Source/Core/Common/GL/GLInterface/EGLAndroid.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "VideoBackends/OGL/GLInterface/EGL.h"
#include "Common/GL/GLInterface/EGL.h"
class cInterfaceEGLAndroid : public cInterfaceEGL
{

2
Source/Core/VideoBackends/OGL/GLInterface/EGLX11.cpp → Source/Core/Common/GL/GLInterface/EGLX11.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLInterface/EGLX11.h"
#include "Common/GL/GLInterface/EGLX11.h"
EGLDisplay cInterfaceEGLX11::OpenDisplay()
{

4
Source/Core/VideoBackends/OGL/GLInterface/EGLX11.h → Source/Core/Common/GL/GLInterface/EGLX11.h
View File

@ -6,8 +6,8 @@
#include <X11/Xlib.h>
#include "VideoBackends/OGL/GLInterface/EGL.h"
#include "VideoBackends/OGL/GLInterface/X11_Util.h"
#include "Common/GL/GLInterface/EGL.h"
#include "Common/GL/GLInterface/X11_Util.h"
class cInterfaceEGLX11 : public cInterfaceEGL
{

12
Source/Core/VideoBackends/OGL/GLInterface/GLInterface.cpp → Source/Core/Common/GL/GLInterface/GLInterface.cpp
View File

@ -2,19 +2,19 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "Common/GL/GLInterfaceBase.h"
#ifdef ANDROID
#include "VideoBackends/OGL/GLInterface/EGLAndroid.h"
#include "Common/GL/GLInterface/EGLAndroid.h"
#elif defined(__APPLE__)
#include "VideoBackends/OGL/GLInterface/AGL.h"
#include "Common/GL/GLInterface/AGL.h"
#elif defined(_WIN32)
#include "VideoBackends/OGL/GLInterface/WGL.h"
#include "Common/GL/GLInterface/WGL.h"
#elif HAVE_X11
#if defined(USE_EGL) && USE_EGL
#include "VideoBackends/OGL/GLInterface/EGLX11.h"
#include "Common/GL/GLInterface/EGLX11.h"
#else
#include "VideoBackends/OGL/GLInterface/GLX.h"
#include "Common/GL/GLInterface/GLX.h"
#endif
#else
#error Platform doesnt have a GLInterface

2
Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp → Source/Core/Common/GL/GLInterface/GLX.cpp
View File

@ -4,7 +4,7 @@
#include <string>
#include "VideoBackends/OGL/GLInterface/GLX.h"
#include "Common/GL/GLInterface/GLX.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VideoConfig.h"

4
Source/Core/VideoBackends/OGL/GLInterface/GLX.h → Source/Core/Common/GL/GLInterface/GLX.h
View File

@ -7,8 +7,8 @@
#include <string>
#include <GL/glx.h>
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLInterface/X11_Util.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLInterface/X11_Util.h"
class cInterfaceGLX : public cInterfaceBase
{

4
Source/Core/VideoBackends/OGL/GLInterface/WGL.cpp → Source/Core/Common/GL/GLInterface/WGL.cpp
View File

@ -4,9 +4,9 @@
#include <string>
#include "Core/Host.h"
#include "Common/GL/GLInterface/WGL.h"
#include "VideoBackends/OGL/GLInterface/WGL.h"
#include "Core/Host.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VertexShaderManager.h"

2
Source/Core/VideoBackends/OGL/GLInterface/WGL.h → Source/Core/Common/GL/GLInterface/WGL.h
View File

@ -5,7 +5,7 @@
#pragma once
#include <string>
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "Common/GL/GLInterfaceBase.h"
class cInterfaceWGL : public cInterfaceBase
{

6
Source/Core/VideoBackends/OGL/GLInterface/X11_Util.cpp → Source/Core/Common/GL/GLInterface/X11_Util.cpp
View File

@ -3,9 +3,11 @@
// Refer to the license.txt file included.
#include "Common/Thread.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLInterface/X11_Util.h"
#include "Core/Host.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLInterface/X11_Util.h"
#include "VideoCommon/VideoConfig.h"
void cX11Window::Initialize(Display *_dpy)

0
Source/Core/VideoBackends/OGL/GLInterface/X11_Util.h → Source/Core/Common/GL/GLInterface/X11_Util.h
View File

0
Source/Core/VideoBackends/OGL/GLInterfaceBase.h → Source/Core/Common/GL/GLInterfaceBase.h
View File

4
Source/Core/VideoBackends/OGL/GLUtil.cpp → Source/Core/Common/GL/GLUtil.cpp
View File

@ -4,12 +4,12 @@
#include "Common/IniFile.h"
#include "Common/StringUtil.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLUtil.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/VideoBackend.h"

3
Source/Core/VideoBackends/OGL/GLUtil.h → Source/Core/Common/GL/GLUtil.h
View File

@ -5,8 +5,7 @@
#pragma once
#include "Common/MathUtil.h"
#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
#include "VideoCommon/VideoConfig.h"
#include "Common/GL/GLExtensions/GLExtensions.h"
#ifndef _WIN32

3
Source/Core/VideoBackends/OGL/BoundingBox.cpp
View File

@ -2,8 +2,9 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/BoundingBox.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoCommon/VideoConfig.h"

35
Source/Core/VideoBackends/OGL/CMakeLists.txt
View File

@ -1,7 +1,6 @@
set(SRCS GLExtensions/GLExtensions.cpp
set(SRCS
BoundingBox.cpp
FramebufferManager.cpp
GLUtil.cpp
main.cpp
NativeVertexFormat.cpp
PerfQuery.cpp
@ -15,43 +14,11 @@ set(SRCS GLExtensions/GLExtensions.cpp
TextureConverter.cpp
VertexManager.cpp)
if(USE_EGL)
set(SRCS ${SRCS} GLInterface/EGL.cpp)
if(ANDROID)
set(SRCS ${SRCS} GLInterface/EGLAndroid.cpp)
elseif(USE_X11)
set(SRCS ${SRCS} GLInterface/EGLX11.cpp)
endif()
endif()
if(WIN32)
set(SRCS ${SRCS} GLInterface/WGL.cpp)
elseif(APPLE)
set(SRCS ${SRCS} GLInterface/AGL.cpp)
elseif(USE_X11)
if (NOT USE_EGL)
set(SRCS ${SRCS} GLInterface/GLX.cpp)
# GLX has a hard dependency on libGL.
# Make sure to link to it if using GLX.
set(LIBS ${LIBS} ${OPENGL_LIBRARIES})
endif()
set(SRCS ${SRCS} GLInterface/X11_Util.cpp)
set(LIBS ${LIBS} ${XRANDR_LIBRARIES})
endif()
set(SRCS ${SRCS} GLInterface/GLInterface.cpp)
set(LIBS ${LIBS}
videocommon
SOIL
common
${X11_LIBRARIES})
if(NOT CMAKE_SYSTEM_NAME MATCHES FreeBSD)
set(LIBS ${LIBS} dl)
endif()
if(USE_EGL)
set(LIBS ${LIBS} EGL)
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|NetBSD")
set(LIBS ${LIBS} usbhid)

2
Source/Core/VideoBackends/OGL/FramebufferManager.cpp
View File

@ -3,10 +3,10 @@
// Refer to the license.txt file included.
#include "Common/CommonFuncs.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Core/HW/Memmap.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/SamplerCache.h"
#include "VideoBackends/OGL/TextureConverter.h"

3
Source/Core/VideoBackends/OGL/FramebufferManager.h
View File

@ -4,7 +4,8 @@
#pragma once
#include "VideoBackends/OGL/GLUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"

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

@ -1,51 +0,0 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include <string>
#include "Common/CommonTypes.h"
#include "VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h"
#include "VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h"
#include "VideoBackends/OGL/GLExtensions/ARB_clip_control.h"
#include "VideoBackends/OGL/GLExtensions/ARB_copy_image.h"
#include "VideoBackends/OGL/GLExtensions/ARB_debug_output.h"
#include "VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h"
#include "VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h"
#include "VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h"
#include "VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h"
#include "VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h"
#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_texture_storage_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"
#include "VideoBackends/OGL/GLExtensions/gl_1_1.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_2.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_3.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_4.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_5.h"
#include "VideoBackends/OGL/GLExtensions/gl_2_0.h"
#include "VideoBackends/OGL/GLExtensions/gl_3_0.h"
#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_occlusion_query_samples.h"
#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h"
namespace GLExtensions
{
// Initializes the interface
bool Init();
// Function for checking if the hardware supports an extension
// example: if (GLExtensions::Supports("GL_ARB_multi_map"))
bool Supports(const std::string& name);
// Returns OpenGL version in format 430
u32 Version();
}

2
Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
View File

@ -5,8 +5,8 @@
#include "Common/MemoryUtil.h"
#include "Common/x64ABI.h"
#include "Common/x64Emitter.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/VertexManager.h"

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

@ -37,10 +37,6 @@
<ItemGroup>
<ClCompile Include="BoundingBox.cpp" />
<ClCompile Include="FramebufferManager.cpp" />
<ClCompile Include="GLExtensions\GLExtensions.cpp" />
<ClCompile Include="GLInterface\GLInterface.cpp" />
<ClCompile Include="GLInterface\WGL.cpp" />
<ClCompile Include="GLUtil.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="NativeVertexFormat.cpp" />
<ClCompile Include="PerfQuery.cpp" />
@ -57,37 +53,6 @@
<ItemGroup>
<ClInclude Include="BoundingBox.h" />
<ClInclude Include="FramebufferManager.h" />
<ClInclude Include="GLExtensions\ARB_blend_func_extended.h" />
<ClInclude Include="GLExtensions\ARB_buffer_storage.h" />
<ClInclude Include="GLExtensions\ARB_clip_control.h" />
<ClInclude Include="GLExtensions\ARB_debug_output.h" />
<ClInclude Include="GLExtensions\ARB_draw_elements_base_vertex.h" />
<ClInclude Include="GLExtensions\ARB_ES2_compatibility.h" />
<ClInclude Include="GLExtensions\ARB_framebuffer_object.h" />
<ClInclude Include="GLExtensions\ARB_get_program_binary.h" />
<ClInclude Include="GLExtensions\ARB_map_buffer_range.h" />
<ClInclude Include="GLExtensions\ARB_sampler_objects.h" />
<ClInclude Include="GLExtensions\ARB_sample_shading.h" />
<ClInclude Include="GLExtensions\ARB_sync.h" />
<ClInclude Include="GLExtensions\ARB_uniform_buffer_object.h" />
<ClInclude Include="GLExtensions\ARB_vertex_array_object.h" />
<ClInclude Include="GLExtensions\ARB_viewport_array.h" />
<ClInclude Include="GLExtensions\GLExtensions.h" />
<ClInclude Include="GLExtensions\gl_1_1.h" />
<ClInclude Include="GLExtensions\gl_1_2.h" />
<ClInclude Include="GLExtensions\gl_1_3.h" />
<ClInclude Include="GLExtensions\gl_1_4.h" />
<ClInclude Include="GLExtensions\gl_1_5.h" />
<ClInclude Include="GLExtensions\gl_2_0.h" />
<ClInclude Include="GLExtensions\gl_3_0.h" />
<ClInclude Include="GLExtensions\gl_3_1.h" />
<ClInclude Include="GLExtensions\gl_3_2.h" />
<ClInclude Include="GLExtensions\gl_common.h" />
<ClInclude Include="GLExtensions\KHR_debug.h" />
<ClInclude Include="GLExtensions\NV_occlusion_query_samples.h" />
<ClInclude Include="GLExtensions\NV_primitive_restart.h" />
<ClInclude Include="GLInterface\WGL.h" />
<ClInclude Include="GLUtil.h" />
<ClInclude Include="main.h" />
<ClInclude Include="PerfQuery.h" />
<ClInclude Include="PostProcessing.h" />

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

@ -13,12 +13,6 @@
<Filter Include="Render">
<UniqueIdentifier>{696df73b-378e-4399-8f21-999b65d78dcd}</UniqueIdentifier>
</Filter>
<Filter Include="GLExtensions">
<UniqueIdentifier>{4366f285-ded5-48c9-9464-03fb46174526}</UniqueIdentifier>
</Filter>
<Filter Include="GLInterface">
<UniqueIdentifier>{1734a626-f6e2-41b1-8753-43447bed39af}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="NativeVertexFormat.cpp">
@ -27,9 +21,6 @@
<ClCompile Include="VertexManager.cpp">
<Filter>Decoder</Filter>
</ClCompile>
<ClCompile Include="GLUtil.cpp">
<Filter>GLUtil</Filter>
</ClCompile>
<ClCompile Include="TextureConverter.cpp">
<Filter>GLUtil</Filter>
</ClCompile>
@ -62,23 +53,11 @@
</ClCompile>
<ClCompile Include="main.cpp" />
<ClCompile Include="SamplerCache.cpp" />
<ClCompile Include="GLExtensions\GLExtensions.cpp">
<Filter>GLExtensions</Filter>
</ClCompile>
<ClCompile Include="GLInterface\GLInterface.cpp">
<Filter>GLInterface</Filter>
</ClCompile>
<ClCompile Include="GLInterface\WGL.cpp">
<Filter>GLInterface</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="VertexManager.h">
<Filter>Decoder</Filter>
</ClInclude>
<ClInclude Include="GLUtil.h">
<Filter>GLUtil</Filter>
</ClInclude>
<ClInclude Include="TextureConverter.h">
<Filter>GLUtil</Filter>
</ClInclude>
@ -112,96 +91,6 @@
<ClInclude Include="main.h" />
<ClInclude Include="SamplerCache.h" />
<ClInclude Include="VideoBackend.h" />
<ClInclude Include="GLExtensions\ARB_blend_func_extended.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_buffer_storage.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_debug_output.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_draw_elements_base_vertex.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_ES2_compatibility.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_framebuffer_object.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_get_program_binary.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_map_buffer_range.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_sample_shading.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_sampler_objects.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_sync.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_uniform_buffer_object.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_vertex_array_object.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_viewport_array.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_1_1.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_1_2.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_1_3.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_1_4.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_1_5.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_2_0.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_3_0.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_3_1.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_3_2.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\gl_common.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\GLExtensions.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\NV_occlusion_query_samples.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\NV_primitive_restart.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\KHR_debug.h">
<Filter>GLExtensions</Filter>
</ClInclude>
<ClInclude Include="GLInterface\WGL.h">
<Filter>GLInterface</Filter>
</ClInclude>
<ClInclude Include="GLExtensions\ARB_clip_control.h">
<Filter>GLExtensions</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />

5
Source/Core/VideoBackends/OGL/PerfQuery.cpp
View File

@ -2,8 +2,9 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/PerfQuery.h"
#include "VideoCommon/RenderBase.h"

3
Source/Core/VideoBackends/OGL/PerfQuery.h
View File

@ -7,7 +7,8 @@
#include <array>
#include <memory>
#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
#include "Common/GL/GLExtensions/GLExtensions.h"
#include "VideoCommon/PerfQueryBase.h"
namespace OGL

3
Source/Core/VideoBackends/OGL/PostProcessing.cpp
View File

@ -6,8 +6,9 @@
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/SamplerCache.h"

3
Source/Core/VideoBackends/OGL/PostProcessing.h
View File

@ -7,7 +7,8 @@
#include <string>
#include <unordered_map>
#include "VideoBackends/OGL/GLUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoCommon/PostProcessing.h"

4
Source/Core/VideoBackends/OGL/ProgramShaderCache.h
View File

@ -5,8 +5,10 @@
#pragma once
#include "Common/LinearDiskCache.h"
#include "Common/GL/GLUtil.h"
#include "Core/ConfigManager.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoCommon/GeometryShaderGen.h"
#include "VideoCommon/PixelShaderGen.h"
#include "VideoCommon/VertexShaderGen.h"

3
Source/Core/VideoBackends/OGL/RasterFont.cpp
View File

@ -4,7 +4,8 @@
#include <vector>
#include "VideoBackends/OGL/GLUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/RasterFont.h"

4
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -17,6 +17,8 @@
#include "Common/StringUtil.h"
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLUtil.h"
#include "Common/Logging/LogManager.h"
#include "Core/ConfigManager.h"
@ -24,8 +26,6 @@
#include "VideoBackends/OGL/BoundingBox.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/main.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"

3
Source/Core/VideoBackends/OGL/SamplerCache.cpp
View File

@ -2,9 +2,10 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "Common/GL/GLInterfaceBase.h"
#include "VideoBackends/OGL/SamplerCache.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/VideoConfig.h"
namespace OGL
{

3
Source/Core/VideoBackends/OGL/SamplerCache.h
View File

@ -6,7 +6,8 @@
#include <map>
#include "VideoBackends/OGL/GLUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/Render.h"
namespace OGL

2
Source/Core/VideoBackends/OGL/StreamBuffer.cpp
View File

@ -3,8 +3,8 @@
// Refer to the license.txt file included.
#include "Common/MemoryUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/StreamBuffer.h"

5
Source/Core/VideoBackends/OGL/StreamBuffer.h
View File

@ -5,8 +5,11 @@
#pragma once
#include <utility>
#include "Common/GL/GLUtil.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoCommon/VideoCommon.h"
namespace OGL

3
Source/Core/VideoBackends/OGL/TextureCache.cpp
View File

@ -12,10 +12,11 @@
#include "Common/MemoryUtil.h"
#include "Common/StringUtil.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Core/HW/Memmap.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/SamplerCache.h"

3
Source/Core/VideoBackends/OGL/TextureCache.h
View File

@ -6,7 +6,8 @@
#include <map>
#include "VideoBackends/OGL/GLUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VideoCommon.h"

3
Source/Core/VideoBackends/OGL/TextureConverter.h
View File

@ -4,7 +4,8 @@
#pragma once
#include "VideoBackends/OGL/GLUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VideoCommon.h"

3
Source/Core/VideoBackends/OGL/VertexManager.h
View File

@ -4,7 +4,8 @@
#pragma once
#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
#include "Common/GL/GLExtensions/GLExtensions.h"
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/NativeVertexFormat.h"
#include "VideoCommon/VertexManagerBase.h"

4
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -44,6 +44,8 @@ Make AA apply instantly during gameplay if possible
#include "Common/CommonPaths.h"
#include "Common/FileSearch.h"
#include "Common/Thread.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLUtil.h"
#include "Common/Logging/LogManager.h"
#include "Core/ConfigManager.h"
@ -52,8 +54,6 @@ Make AA apply instantly during gameplay if possible
#include "VideoBackends/OGL/BoundingBox.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/PerfQuery.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"

2
Source/Core/VideoBackends/Software/EfbCopy.cpp
View File

@ -2,9 +2,9 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.
#include "Common/GL/GLInterfaceBase.h"
#include "Core/Core.h"
#include "Core/HW/Memmap.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/Software/BPMemLoader.h"
#include "VideoBackends/Software/DebugUtil.h"
#include "VideoBackends/Software/EfbCopy.h"

2
Source/Core/VideoBackends/Software/RasterFont.cpp
View File

@ -4,7 +4,7 @@
#include <string.h>
#include "VideoBackends/OGL/GLUtil.h"
#include "Common/GL/GLUtil.h"
#include "VideoBackends/Software/RasterFont.h"
const GLubyte rasters[][13] = {

7
Source/Core/VideoBackends/Software/SWRenderer.cpp
View File

@ -9,13 +9,16 @@
#include "Common/CommonTypes.h"
#include "Common/StringUtil.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLUtil.h"
#include "Core/Core.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/Software/RasterFont.h"
#include "VideoBackends/Software/SWCommandProcessor.h"
#include "VideoBackends/Software/SWRenderer.h"
#include "VideoBackends/Software/SWStatistics.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/OnScreenDisplay.h"

6
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -8,6 +8,9 @@
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"
#include "Common/GL/GLInterfaceBase.h"
#include "Common/GL/GLUtil.h"
#include "Common/GL/GLExtensions/GLExtensions.h"
#include "Common/Logging/LogManager.h"
#include "Core/ConfigManager.h"
@ -16,9 +19,6 @@
#include "Core/HW/Memmap.h"
#include "Core/HW/VideoInterface.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
#include "VideoBackends/Software/BPMemLoader.h"
#include "VideoBackends/Software/Clipper.h"
#include "VideoBackends/Software/DebugUtil.h"

2
Source/UnitTests/TestUtils/StubHost.cpp
View File

@ -7,8 +7,8 @@
#include <string>
#include "Common/GL/GLInterfaceBase.h"
#include "Core/Host.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
void Host_NotifyMapLoaded() {}
void Host_RefreshDSPDebuggerWindow() {}