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

Fix an issue that made it so that the emulator could not be resized in the nowx build on linux. Also some code cleanup in the OpenGL and Software plugins.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5889 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-07-16 21:56:40 +00:00
parent aa88d8b790
commit 25efe443ea
6 changed files with 216 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+17 -39
View File
@@ -22,34 +22,23 @@
#include "Render.h" #include "Render.h"
#include "GLUtil.h"
#if defined(_WIN32) #if defined(_WIN32)
#include "OS/Win32.h" #include "OS/Win32.h"
static HDC hDC = NULL; // Private GDI Device Context
static HGLRC hRC = NULL; // Permanent Rendering Context
extern HINSTANCE g_hInstance;
#else #else
struct RECT GLWindow GLWin;
{
int left, top;
int right, bottom;
};
#endif #endif
#include "GLUtil.h"
// Handles OpenGL and the window // Handles OpenGL and the window
// Window dimensions. // Window dimensions.
static int s_backbuffer_width; static int s_backbuffer_width;
static int s_backbuffer_height; static int s_backbuffer_height;
#ifndef _WIN32
GLWindow GLWin;
#endif
#if defined(_WIN32)
static HDC hDC = NULL; // Private GDI Device Context
static HGLRC hRC = NULL; // Permanent Rendering Context
extern HINSTANCE g_hInstance;
#endif
void OpenGL_SwapBuffers() void OpenGL_SwapBuffers()
{ {
#if defined(USE_WX) && USE_WX #if defined(USE_WX) && USE_WX
@@ -76,15 +65,15 @@ u32 OpenGL_GetBackbufferHeight()
void OpenGL_SetWindowText(const char *text) void OpenGL_SetWindowText(const char *text)
{ {
#if defined(USE_WX) && USE_WX #if defined(USE_WX) && USE_WX
// GLWin.frame->SetTitle(wxString::FromAscii(text)); // GLWin.frame->SetTitle(wxString::FromAscii(text));
#elif defined(__APPLE__) #elif defined(__APPLE__)
cocoaGLSetTitle(GLWin.cocoaWin, text); cocoaGLSetTitle(GLWin.cocoaWin, text);
#elif defined(_WIN32) #elif defined(_WIN32)
// TODO convert text to unicode and change SetWindowTextA to SetWindowText // TODO convert text to unicode and change SetWindowTextA to SetWindowText
SetWindowTextA(EmuWindow::GetWnd(), text); SetWindowTextA(EmuWindow::GetWnd(), text);
#elif defined(HAVE_X11) && HAVE_X11 // GLX #elif defined(HAVE_X11) && HAVE_X11
// Tell X to ask the window manager to set the window title. (X // Tell X to ask the window manager to set the window title.
// itself doesn't provide window title functionality.) // (X itself doesn't provide window title functionality.)
XStoreName(GLWin.dpy, GLWin.win, text); XStoreName(GLWin.dpy, GLWin.win, text);
#endif #endif
} }
@@ -127,8 +116,7 @@ void CreateXWindow (void)
GLWin.attr.colormap = XCreateColormap(GLWin.dpy, GLWin.attr.colormap = XCreateColormap(GLWin.dpy,
GLWin.parent, GLWin.vi->visual, AllocNone); GLWin.parent, GLWin.vi->visual, AllocNone);
GLWin.attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | GLWin.attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask |
StructureNotifyMask | ResizeRedirectMask | EnterWindowMask | StructureNotifyMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask;
LeaveWindowMask | FocusChangeMask;
GLWin.attr.background_pixel = BlackPixel(GLWin.dpy, GLWin.screen); GLWin.attr.background_pixel = BlackPixel(GLWin.dpy, GLWin.screen);
GLWin.attr.border_pixel = 0; GLWin.attr.border_pixel = 0;
@@ -147,7 +135,6 @@ void CreateXWindow (void)
void DestroyXWindow(void) void DestroyXWindow(void)
{ {
/* switch back to original desktop resolution if we were in fullscreen */
XUnmapWindow(GLWin.dpy, GLWin.win); XUnmapWindow(GLWin.dpy, GLWin.win);
GLWin.win = 0; GLWin.win = 0;
XFreeColormap(GLWin.dpy, GLWin.attr.colormap); XFreeColormap(GLWin.dpy, GLWin.attr.colormap);
@@ -366,7 +353,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion); glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion);
NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion); NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion);
/* get an appropriate visual */ // Get an appropriate visual
GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl); GLWin.vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl);
if (GLWin.vi == NULL) if (GLWin.vi == NULL)
{ {
@@ -428,16 +415,12 @@ bool OpenGL_MakeCurrent()
void OpenGL_Update() void OpenGL_Update()
{ {
#if defined(USE_WX) && USE_WX #if defined(USE_WX) && USE_WX
RECT rcWindow = {0}; GLWin.glCanvas->GetSize((int *)&GLWin.width, (int *)&GLWin.height);
rcWindow.right = GLWin.width; s_backbuffer_width = GLWin.width;
rcWindow.bottom = GLWin.height; s_backbuffer_height = GLWin.height;
// TODO fill in
#elif defined(__APPLE__) #elif defined(__APPLE__)
RECT rcWindow = {0};
rcWindow.right = GLWin.width; // Is anything needed here?
rcWindow.bottom = GLWin.height;
#elif defined(_WIN32) #elif defined(_WIN32)
RECT rcWindow; RECT rcWindow;
@@ -452,11 +435,8 @@ void OpenGL_Update()
GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow); GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow);
} }
// ---------------------------------------------------------------------------------------
// Get the new window width and height // Get the new window width and height
// ------------------
// See below for documentation // See below for documentation
// ------------------
int width = rcWindow.right - rcWindow.left; int width = rcWindow.right - rcWindow.left;
int height = rcWindow.bottom - rcWindow.top; int height = rcWindow.bottom - rcWindow.top;
@@ -467,8 +447,6 @@ void OpenGL_Update()
s_backbuffer_width = width; s_backbuffer_width = width;
s_backbuffer_height = height; s_backbuffer_height = height;
} }
#elif defined(HAVE_X11) && HAVE_X11
#endif #endif
} }
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+7 -8
View File
@@ -71,11 +71,15 @@
#include <sys/types.h> #include <sys/types.h>
typedef struct { typedef struct {
int screen; #if defined(USE_WX) && USE_WX
#if defined(__APPLE__) wxGLCanvas *glCanvas;
wxPanel *panel;
wxGLContext *glCtxt;
#elif defined(__APPLE__)
NSWindow *cocoaWin; NSWindow *cocoaWin;
NSOpenGLContext *cocoaCtx; NSOpenGLContext *cocoaCtx;
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
int screen;
Window win; Window win;
Window parent; Window parent;
Display *dpy; Display *dpy;
@@ -83,13 +87,8 @@ typedef struct {
GLXContext ctx; GLXContext ctx;
XSetWindowAttributes attr; XSetWindowAttributes attr;
Common::Thread *xEventThread; Common::Thread *xEventThread;
#endif // X11
#if defined(USE_WX) && USE_WX
wxGLCanvas *glCanvas;
wxPanel *panel;
wxGLContext *glCtxt;
#endif
int x, y; int x, y;
#endif
unsigned int width, height; unsigned int width, height;
} GLWindow; } GLWindow;
Source/Plugins/Plugin_VideoOGL/Src/SConscript
+9 -22
View File
@@ -1,11 +1,7 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
# can we import path in one place?
import sys import sys
sys.path.append(env['base_dir']+'SconsTests')
import utils
import platform
name = "Plugin_VideoOGL" name = "Plugin_VideoOGL"
@@ -24,41 +20,32 @@ files = [
'XFB.cpp', 'XFB.cpp',
'PostProcessing.cpp', 'PostProcessing.cpp',
'FramebufferManager.cpp', 'FramebufferManager.cpp',
'main.cpp',
'GLUtil.cpp'
] ]
linkFlags = [
]
libs = [ libs = [
'videocommon', 'GLEW', 'SOIL', 'common' 'videocommon', 'GLEW', 'SOIL', 'common'
] ]
gfxenv = env.Clone() gfxenv = env.Clone()
files += [
'main.cpp',
'GLUtil.cpp',
]
if sys.platform != 'darwin': if sys.platform != 'darwin':
if gfxenv['HAVE_OPENCL']: if gfxenv['HAVE_OPENCL']:
libs += [ 'OpenCL'] libs += [ 'OpenCL']
if gfxenv['HAVE_WX']: if gfxenv['HAVE_WX']:
files += [ files += [
'GUI/ConfigDlg.cpp', 'GUI/ConfigDlg.cpp',
'Debugger/Debugger.cpp', 'Debugger/Debugger.cpp',
] ]
if sys.platform == 'darwin': if sys.platform == 'darwin':
files += [ 'cocoaGL.m' ] files += [ 'cocoaGL.m' ]
if sys.platform == 'win32': if sys.platform == 'win32':
files += [ 'OS/Win32.cpp' ] files += [ 'OS/Win32.cpp' ]
libs += [ env['base_dir'] + '/Externals/Cg/' ]
if sys.platform == 'win32':
files += [
'OS/Win32.cpp'
]
libs += [
env['base_dir'] + '/Externals/Cg/'
]
gfxenv['CPPPATH'] += libs gfxenv['CPPPATH'] += libs
gfxenv.SharedLibrary( gfxenv.SharedLibrary(
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
+155 -193
View File
File diff suppressed because it is too large Load Diff
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h
+15 -25
View File
@@ -19,9 +19,6 @@
#ifndef _GLINIT_H_ #ifndef _GLINIT_H_
#define _GLINIT_H_ #define _GLINIT_H_
#if defined GLTEST && GLTEST
#include "nGLUtil.h"
#else
#include "Common.h" #include "Common.h"
#include <string> #include <string>
#include "VideoConfig.h" #include "VideoConfig.h"
@@ -42,11 +39,12 @@
#include <GL/glew.h> #include <GL/glew.h>
#include "wx/wx.h" #include "wx/wx.h"
#include "wx/glcanvas.h" #include "wx/glcanvas.h"
#undef HAVE_X11
#elif defined(HAVE_X11) && HAVE_X11 #elif defined(HAVE_X11) && HAVE_X11
#define I_NEED_OS2_H // HAXXOR
#include <GL/glxew.h> #include <GL/glxew.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
#else #else
#include <GL/glew.h> #include <GL/glew.h>
#endif // end USE_WX #endif // end USE_WX
@@ -67,31 +65,25 @@
#endif #endif
#ifndef _WIN32 #ifndef _WIN32
#if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
#endif // X11
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
typedef struct { typedef struct {
int screen; #if defined(USE_WX) && USE_WX
#if defined(HAVE_X11) && HAVE_X11 wxGLCanvas *glCanvas;
Window win; wxPanel *panel;
Window parent; wxGLContext *glCtxt;
#elif defined(HAVE_X11) && HAVE_X11
int screen;
Window win;
Window parent;
Display *dpy; Display *dpy;
GLXContext ctx; GLXContext ctx;
XSetWindowAttributes attr; XSetWindowAttributes attr;
#elif defined(USE_WX) && USE_WX int x, y;
wxGLCanvas *glCanvas;
wxFrame *frame;
wxGLContext *glCtxt;
#endif #endif
int x, y; unsigned int width, height;
unsigned int width, height;
unsigned int depth;
} GLWindow; } GLWindow;
extern GLWindow GLWin; extern GLWindow GLWin;
@@ -135,6 +127,4 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line);
#define GL_REPORT_ERRORD() #define GL_REPORT_ERRORD()
#endif #endif
#endif // GLTEST ??
#endif // _GLINIT_H_ #endif // _GLINIT_H_
Source/Plugins/Plugin_VideoSoftware/Src/SConscript
+13 -25
View File
@@ -1,11 +1,7 @@
# -*- python -*- # -*- python -*-
Import('env') Import('env')
# can we import path in one place?
import sys import sys
sys.path.append(env['base_dir']+'SconsTests')
import utils
import platform
name = "Plugin_VideoSoftware" name = "Plugin_VideoSoftware"
@@ -25,38 +21,30 @@ files = [
'Rasterizer.cpp', 'Rasterizer.cpp',
'RasterFont.cpp', 'RasterFont.cpp',
'Renderer.cpp', 'Renderer.cpp',
'SetupUnit.cpp', 'SetupUnit.cpp',
'Statistics.cpp', 'Statistics.cpp',
'Tev.cpp', 'Tev.cpp',
'TextureEncoder.cpp', 'TextureEncoder.cpp',
'TextureSampler.cpp', 'TextureSampler.cpp',
'TransformUnit.cpp', 'TransformUnit.cpp',
'VertexFormatConverter.cpp', 'VertexFormatConverter.cpp',
'VertexLoader.cpp', 'VertexLoader.cpp',
'VideoConfig.cpp', 'VideoConfig.cpp',
'XFMemLoader.cpp', 'XFMemLoader.cpp',
]
linkFlags = [
] ]
libs = [ libs = [
'videocommon', 'GLEW', 'SOIL', 'common' 'videocommon', 'GLEW', 'SOIL', 'common'
] ]
gfxenv = env.Clone() gfxenv = env.Clone()
if sys.platform == 'win32':
files += [ 'Win32.cpp' ]
if sys.platform == 'darwin': if sys.platform == 'darwin':
files += [ 'cocoaGL.m', ] files += [ 'cocoaGL.m', ]
if sys.platform == 'win32': if sys.platform == 'win32':
files += [ files += [ 'Win32.cpp' ]
'Win32.cpp' libs += [ env['base_dir'] + '/Externals/Cg/' ]
]
libs += [
env['base_dir'] + '/Externals/Cg/'
]
gfxenv['CPPPATH'] += libs gfxenv['CPPPATH'] += libs
gfxenv.SharedLibrary( gfxenv.SharedLibrary(