piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 09:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move GLInterface around to remove VideoBackends dependency on DolphinWX

Browse Source
This commit is contained in:
Pierre Bourdon
2014-08-01 23:21:03 -07:00
parent 7e83a0ea9b
commit 226a9c2392
30 changed files with 71 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/GLInterface/AGL.h
View File

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

2
Source/Core/DolphinWX/GLInterface/EGL.h
View File

@ -8,7 +8,7 @@
#include <EGL/egl.h>
#include "Core/ConfigManager.h"
#include "DolphinWX/GLInterface/InterfaceBase.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
class cPlatform

23
Source/Core/DolphinWX/GLInterface/GLInterface.cpp Normal file
View File

@ -0,0 +1,23 @@
// Copyright 2014 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "DolphinWX/GLInterface/GLInterface.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
GLWindow GLWin;
cInterfaceBase* HostGL_CreateGLInterface()
{
#if defined(USE_EGL) && USE_EGL
return new cInterfaceEGL;
#elif defined(__APPLE__)
return new cInterfaceAGL;
#elif defined(_WIN32)
return new cInterfaceWGL;
#elif defined(HAVE_X11) && HAVE_X11
return new cInterfaceGLX;
#else
return nullptr;
#endif
}

1
Source/Core/DolphinWX/GLInterface/GLInterface.h
View File

@ -108,5 +108,4 @@ typedef struct {
unsigned int width, height;
} GLWindow;
extern cInterfaceBase *GLInterface;
extern GLWindow GLWin;

2
Source/Core/DolphinWX/GLInterface/GLX.h
View File

@ -6,8 +6,8 @@
#include <string>
#include "DolphinWX/GLInterface/InterfaceBase.h"
#include "DolphinWX/GLInterface/X11_Util.h"
#include "VideoBackends/OGL/GLInterfaceBase.h"
class cInterfaceGLX : public cInterfaceBase
{

43
Source/Core/DolphinWX/GLInterface/InterfaceBase.h
View File

@ -1,43 +0,0 @@
// Copyright 2013 Dolphin Emulator Project
// Licensed under GPLv2
// Refer to the license.txt file included.
#pragma once
#include <string>
#include "Common/Common.h"
enum GLInterfaceMode {
MODE_DETECT = 0,
MODE_OPENGL,
MODE_OPENGLES2,
MODE_OPENGLES3,
};
class cInterfaceBase
{
protected:
// Window dimensions.
u32 s_backbuffer_width;
u32 s_backbuffer_height;
u32 s_opengl_mode;
public:
virtual void Swap() {}
virtual void UpdateFPSDisplay(const std::string& text) {}
virtual void SetMode(u32 mode) { s_opengl_mode = GLInterfaceMode::MODE_OPENGL; }
virtual u32 GetMode() { return s_opengl_mode; }
virtual void* GetFuncAddress(const std::string& name) { return nullptr; }
virtual bool Create(void *&window_handle) { return true; }
virtual bool MakeCurrent() { return true; }
virtual bool ClearCurrent() { return true; }
virtual void Shutdown() {}
virtual void SwapInterval(int Interval) { }
virtual u32 GetBackBufferWidth() { return s_backbuffer_width; }
virtual u32 GetBackBufferHeight() { return s_backbuffer_height; }
virtual void SetBackBufferDimensions(u32 W, u32 H) {s_backbuffer_width = W; s_backbuffer_height = H; }
virtual void Update() { }
virtual bool PeekMessages() { return false; }
};

2
Source/Core/DolphinWX/GLInterface/WGL.h
View File

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