izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3062 from phire/moveGL

Browse Source 
Move GL interface code out of the OpenGL video backend.
This commit is contained in:
Markus Wick
2015-09-22 15:32:48 +02:00
parent a537ca7543 c9836ff592
commit 3930c929cb
83 changed files with 380 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Common/CMakeLists.txt
+35
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)
Source/Core/Common/Common.vcxproj
+39
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" />
Source/Core/Common/Common.vcxproj.filters
+126
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" />
Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h → Source/Core/Common/GL/GLExtensions/ARB_ES2_compatibility.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h → Source/Core/Common/GL/GLExtensions/ARB_blend_func_extended.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h → Source/Core/Common/GL/GLExtensions/ARB_buffer_storage.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_clip_control.h → Source/Core/Common/GL/GLExtensions/ARB_clip_control.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_copy_image.h → Source/Core/Common/GL/GLExtensions/ARB_copy_image.h
+1 -1
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);
Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h → Source/Core/Common/GL/GLExtensions/ARB_debug_output.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h → Source/Core/Common/GL/GLExtensions/ARB_draw_elements_base_vertex.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h → Source/Core/Common/GL/GLExtensions/ARB_framebuffer_object.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h → Source/Core/Common/GL/GLExtensions/ARB_get_program_binary.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h → Source/Core/Common/GL/GLExtensions/ARB_map_buffer_range.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h → Source/Core/Common/GL/GLExtensions/ARB_sample_shading.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h → Source/Core/Common/GL/GLExtensions/ARB_sampler_objects.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h → Source/Core/Common/GL/GLExtensions/ARB_sync.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_multisample.h → Source/Core/Common/GL/GLExtensions/ARB_texture_multisample.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_texture_storage_multisample.h → Source/Core/Common/GL/GLExtensions/ARB_texture_storage_multisample.h
+1 -1
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);
Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h → Source/Core/Common/GL/GLExtensions/ARB_uniform_buffer_object.h
+1 -1
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;
Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h → Source/Core/Common/GL/GLExtensions/ARB_vertex_array_object.h
+1 -1
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;

Some files were not shown because too many files have changed in this diff Show More