some more gstest work
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1616 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
d640dec401
commit
347da362f1
|
@ -43,7 +43,7 @@ class GLWindow {
|
||||||
int GetYoff() {return yOffset;}
|
int GetYoff() {return yOffset;}
|
||||||
int GetXoff() {return xOffset;}
|
int GetXoff() {return xOffset;}
|
||||||
|
|
||||||
virtual bool valid() { return false; }
|
static bool valid() { return false; }
|
||||||
// bool GLwindow(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight) {};
|
// bool GLwindow(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight) {};
|
||||||
// setResolution
|
// setResolution
|
||||||
// resolution iter
|
// resolution iter
|
||||||
|
|
|
@ -30,6 +30,7 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
|
||||||
EVT_CHECKBOX(ID_RENDERTOMAINWINDOW, ConfigDialog::GeneralSettingsChanged)
|
EVT_CHECKBOX(ID_RENDERTOMAINWINDOW, ConfigDialog::GeneralSettingsChanged)
|
||||||
EVT_COMBOBOX(ID_FULLSCREENCB, ConfigDialog::GeneralSettingsChanged)
|
EVT_COMBOBOX(ID_FULLSCREENCB, ConfigDialog::GeneralSettingsChanged)
|
||||||
EVT_COMBOBOX(ID_WINDOWRESOLUTIONCB, ConfigDialog::GeneralSettingsChanged)
|
EVT_COMBOBOX(ID_WINDOWRESOLUTIONCB, ConfigDialog::GeneralSettingsChanged)
|
||||||
|
EVT_COMBOBOX(ID_RENDERBACKEND, ConfigDialog::GeneralSettingsChanged)
|
||||||
EVT_COMBOBOX(ID_ALIASMODECB, ConfigDialog::GeneralSettingsChanged)
|
EVT_COMBOBOX(ID_ALIASMODECB, ConfigDialog::GeneralSettingsChanged)
|
||||||
EVT_CHOICE(ID_MAXANISOTROPY, ConfigDialog::GeneralSettingsChanged)
|
EVT_CHOICE(ID_MAXANISOTROPY, ConfigDialog::GeneralSettingsChanged)
|
||||||
EVT_CHECKBOX(ID_FORCEFILTERING, ConfigDialog::GeneralSettingsChanged)
|
EVT_CHECKBOX(ID_FORCEFILTERING, ConfigDialog::GeneralSettingsChanged)
|
||||||
|
|
|
@ -16,6 +16,7 @@ public:
|
||||||
virtual void Update();
|
virtual void Update();
|
||||||
virtual bool MakeCurrent();
|
virtual bool MakeCurrent();
|
||||||
|
|
||||||
|
static bool valid() { return true; }
|
||||||
~SDLWindow();
|
~SDLWindow();
|
||||||
SDLWindow(int _iwidth, int _iheight);
|
SDLWindow(int _iwidth, int _iheight);
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,7 @@ public:
|
||||||
virtual void Update();
|
virtual void Update();
|
||||||
virtual bool MakeCurrent();
|
virtual bool MakeCurrent();
|
||||||
|
|
||||||
|
static bool valid() { return true; }
|
||||||
~WXGLWindow();
|
~WXGLWindow();
|
||||||
WXGLWindow(int _iwidth, int _iheight);
|
WXGLWindow(int _iwidth, int _iheight);
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@ public:
|
||||||
virtual void Update();
|
virtual void Update();
|
||||||
virtual bool MakeCurrent();
|
virtual bool MakeCurrent();
|
||||||
|
|
||||||
|
static bool valid() { return true; }
|
||||||
~X11Window();
|
~X11Window();
|
||||||
X11Window(int _iwidth, int _iheight);
|
X11Window(int _iwidth, int _iheight);
|
||||||
};
|
};
|
||||||
|
|
|
@ -110,3 +110,16 @@ int OpenGL_GetXoff() {
|
||||||
int OpenGL_GetYoff() {
|
int OpenGL_GetYoff() {
|
||||||
return glWin->GetYoff();
|
return glWin->GetYoff();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OpenGL_AddBackends(ConfigDialog *frame) {
|
||||||
|
if(SDLWindow::valid())
|
||||||
|
frame->AddRenderBackend("SDL");
|
||||||
|
if(X11Window::valid())
|
||||||
|
frame->AddRenderBackend("X11");
|
||||||
|
if(WXGLWindow::valid())
|
||||||
|
frame->AddRenderBackend("WXGL");
|
||||||
|
}
|
||||||
|
|
||||||
|
void OpenGL_AddResolutions(ConfigDialog *frame) {
|
||||||
|
// TODO get resolution iter
|
||||||
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
#include "Config.h"
|
#include "Config.h"
|
||||||
#include "pluginspecs_video.h"
|
#include "pluginspecs_video.h"
|
||||||
|
#include "GUI/ConfigDlg.h"
|
||||||
#include "GLWindow.h"
|
#include "GLWindow.h"
|
||||||
// backends
|
// backends
|
||||||
#include "SDLWindow.h"
|
#include "SDLWindow.h"
|
||||||
|
@ -41,6 +42,9 @@
|
||||||
#define GL_REPORT_ERRORD()
|
#define GL_REPORT_ERRORD()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void OpenGL_AddBackends(ConfigDialog *frame);
|
||||||
|
void OpenGL_AddResolutions(ConfigDialog *frame);
|
||||||
|
|
||||||
// TODO old interface removal
|
// TODO old interface removal
|
||||||
bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _width, int _height);
|
bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _width, int _height);
|
||||||
bool OpenGL_MakeCurrent();
|
bool OpenGL_MakeCurrent();
|
||||||
|
|
Loading…
Reference in New Issue