diff --git a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt index e2093426ff..28a908683c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt +++ b/Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt @@ -5,7 +5,6 @@ set(SRCS Src/BPMemLoader.cpp Src/DebugUtil.cpp Src/EfbCopy.cpp Src/EfbInterface.cpp - Src/SWGLUtil.cpp Src/HwRasterizer.cpp Src/SWmain.cpp Src/OpcodeDecoder.cpp diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj index 2654df760f..a8b12c6766 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj @@ -478,14 +478,6 @@ RelativePath=".\Src\SWCommandProcessor.h" > - - - - diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj index b557b63c1b..64c067d14c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj @@ -174,7 +174,6 @@ - @@ -207,7 +206,6 @@ - @@ -251,4 +249,4 @@ - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters index 146b5a0fd6..1f33460bed 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj.filters @@ -8,7 +8,6 @@ - @@ -38,7 +37,6 @@ - @@ -77,4 +75,4 @@ {80e30848-1174-4168-a8f7-da2553f872b1} - \ No newline at end of file + diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp index 985a2af1a3..62f00b22b8 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp @@ -25,7 +25,7 @@ #include "DebugUtil.h" #include "HwRasterizer.h" #include "SWCommandProcessor.h" -#include "SWGLUtil.h" +#include "../../Plugin_VideoOGL/Src/GLUtil.h" #include "HW/Memmap.h" #include "Core.h" diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp index f4053ac547..8736066524 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.cpp @@ -22,7 +22,6 @@ #include "BPMemLoader.h" #include "HwRasterizer.h" -#include "SWGLUtil.h" #include "NativeVertexFormat.h" #include "DebugUtil.h" diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h index 21b002e737..568c313215 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h +++ b/Source/Plugins/Plugin_VideoSoftware/Src/HwRasterizer.h @@ -21,7 +21,7 @@ #include #include "BPMemLoader.h" -#include "SWGLUtil.h" +#include "../../Plugin_VideoOGL/Src/GLUtil.h" struct OutputVertexData; diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index 625a5250e7..ef50743f0c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript @@ -12,7 +12,6 @@ files = [ 'DebugUtil.cpp', 'EfbCopy.cpp', 'EfbInterface.cpp', - 'SWGLUtil.cpp', 'HwRasterizer.cpp', 'SWmain.cpp', 'OpcodeDecoder.cpp', diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWGLUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWGLUtil.cpp deleted file mode 100644 index d0ea0d022f..0000000000 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWGLUtil.cpp +++ /dev/null @@ -1,485 +0,0 @@ -// Copyright (C) 2003-2009 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - -#include "SWVideoConfig.h" -#include "IniFile.h" -#include "Setup.h" -#include "ConfigManager.h" -#include "Core.h" -#include "Host.h" -#include "VideoBackend.h" - -#include "SWGLUtil.h" - -#if 0 -#if defined(_WIN32) -#include "Win32.h" -static HDC hDC = NULL; // Private GDI Device Context -static HGLRC hRC = NULL; // Permanent Rendering Context -extern HINSTANCE g_hInstance; -#else -GLWindow GLWin; -#endif - -// Handles OpenGL and the window - -// Window dimensions. -static int s_backbuffer_width; -static int s_backbuffer_height; - -static void*& VideoWindowHandle() -{ - return SConfig::GetInstance().m_LocalCoreStartupParameter.hMainWindow; -} - -void OpenGL_SwapBuffers() -{ -#if defined(USE_WX) && USE_WX - GLWin.glCanvas->SwapBuffers(); -#elif defined(_WIN32) - SwapBuffers(hDC); -#elif defined(HAVE_X11) && HAVE_X11 - glXSwapBuffers(GLWin.dpy, GLWin.win); -#endif -} - -u32 OpenGL_GetBackbufferWidth() -{ - return s_backbuffer_width; -} - -u32 OpenGL_GetBackbufferHeight() -{ - return s_backbuffer_height; -} - -void OpenGL_SetWindowText(const char *text) -{ -#if defined(USE_WX) && USE_WX - // Handled by Host_UpdateTitle() -#elif defined(_WIN32) - // TODO convert text to unicode and change SetWindowTextA to SetWindowText - SetWindowTextA(EmuWindow::GetWnd(), text); -#elif defined(HAVE_X11) && HAVE_X11 - // Tell X to ask the window manager to set the window title. - // (X itself doesn't provide window title functionality.) - XStoreName(GLWin.dpy, GLWin.win, text); -#endif -} -#endif - -namespace SW -{ - -// Draw messages on top of the screen -unsigned int VideoBackend::PeekMessages() -{ -#ifdef _WIN32 - // TODO: peekmessage - MSG msg; - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) - { - if (msg.message == WM_QUIT) - return FALSE; - TranslateMessage(&msg); - DispatchMessage(&msg); - } - return TRUE; -#else - return false; -#endif -} - -// Show the current FPS -void VideoBackend::UpdateFPSDisplay(const char *text) -{ - char temp[100]; - snprintf(temp, sizeof temp, "%s | Software | %s", svn_rev_str, text); - OpenGL_SetWindowText(temp); -} - -} - -#if 0 -// Create rendering window. -// Call browser: Core.cpp:EmuThread() > main.cpp:Video_Initialize() -bool OpenGL_Create(int _twidth, int _theight) -{ - int xPos, yPos; - Core::Callback_VideoGetWindowSize(xPos, yPos, _twidth, _theight); - -#if defined(_WIN32) - EmuWindow::SetSize(_twidth, _theight); -#endif - - // Control window size and picture scaling - s_backbuffer_width = _twidth; - s_backbuffer_height = _theight; - -#if defined(USE_WX) && USE_WX - GLWin.panel = (wxPanel*)VideoWindowHandle(); - GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, - wxPoint(0, 0), wxSize(_twidth, _theight)); - GLWin.glCanvas->Show(true); - if (GLWin.glCtxt == NULL) // XXX dirty hack - GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); - -#elif defined(_WIN32) - // Create rendering window in Windows - VideoWindowHandle() = (void*)EmuWindow::Create((HWND)VideoWindowHandle(), g_hInstance, _T("Please wait...")); - - // Show the window - EmuWindow::Show(); - - if (VideoWindowHandle() == NULL) - { - Host_SysMessage("failed to create window"); - return false; - } - - GLuint PixelFormat; // Holds The Results After Searching For A Match - DWORD dwExStyle; // Window Extended Style - DWORD dwStyle; // Window Style - - RECT rcdesktop; - GetWindowRect(GetDesktopWindow(), &rcdesktop); - - dwExStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE; - dwStyle = WS_OVERLAPPEDWINDOW; - - RECT rc = {0, 0, s_backbuffer_width, s_backbuffer_height}; - AdjustWindowRectEx(&rc, dwStyle, FALSE, dwExStyle); - - int X = (rcdesktop.right-rcdesktop.left)/2 - (rc.right-rc.left)/2; - int Y = (rcdesktop.bottom-rcdesktop.top)/2 - (rc.bottom-rc.top)/2; - - // EmuWindow::GetWnd() is either the new child window or the new separate window - SetWindowPos(EmuWindow::GetWnd(), NULL, X, Y, rc.right-rc.left, rc.bottom-rc.top, SWP_NOREPOSITION | SWP_NOZORDER); - - PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be - { - sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor - 1, // Version Number - PFD_DRAW_TO_WINDOW | // Format Must Support Window - PFD_SUPPORT_OPENGL | // Format Must Support OpenGL - PFD_DOUBLEBUFFER, // Must Support Double Buffering - PFD_TYPE_RGBA, // Request An RGBA Format - 32, // Select Our Color Depth - 0, 0, 0, 0, 0, 0, // Color Bits Ignored - 0, // 8bit Alpha Buffer - 0, // Shift Bit Ignored - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored - 24, // 24Bit Z-Buffer (Depth Buffer) - 8, // 8bit Stencil Buffer - 0, // No Auxiliary Buffer - PFD_MAIN_PLANE, // Main Drawing Layer - 0, // Reserved - 0, 0, 0 // Layer Masks Ignored - }; - - if (!(hDC=GetDC(EmuWindow::GetWnd()))) { - PanicAlert("(1) Can't create an OpenGL Device context. Fail."); - return false; - } - - if (!(PixelFormat = ChoosePixelFormat(hDC,&pfd))) { - PanicAlert("(2) Can't find a suitable PixelFormat."); - return false; - } - - if (!SetPixelFormat(hDC, PixelFormat, &pfd)) { - PanicAlert("(3) Can't set the PixelFormat."); - return false; - } - - if (!(hRC = wglCreateContext(hDC))) { - PanicAlert("(4) Can't create an OpenGL rendering context."); - return false; - } - // -------------------------------------- - -#elif defined(HAVE_X11) && HAVE_X11 - XVisualInfo *vi; - Colormap cmap; - int glxMajorVersion, glxMinorVersion; - Atom wmDelete; - - // attributes for a single buffered visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer - int attrListSgl[] = {GLX_RGBA, GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, - None}; - - // attributes for a double buffered visual in RGBA format with at least - // 8 bits per color and a 24 bit depth buffer - int attrListDbl[] = { GLX_RGBA, GLX_DOUBLEBUFFER, - GLX_RED_SIZE, 8, - GLX_GREEN_SIZE, 8, - GLX_BLUE_SIZE, 8, - GLX_DEPTH_SIZE, 24, - GLX_SAMPLE_BUFFERS_ARB, GLX_SAMPLES_ARB, 1, None }; - - int attrListDefault[] = { - GLX_RGBA, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - GLX_DOUBLEBUFFER, - GLX_DEPTH_SIZE, 1, - None }; - - GLWin.dpy = XOpenDisplay(0); - GLWin.parent = (Window)VideoWindowHandle(); - GLWin.screen = DefaultScreen(GLWin.dpy); - - // Get an appropriate visual - vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDbl); - if (vi == NULL) - { - vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListSgl); - if (vi != NULL) - { - ERROR_LOG(VIDEO, "Only Singlebuffered Visual!"); - } - else - { - vi = glXChooseVisual(GLWin.dpy, GLWin.screen, attrListDefault); - if (vi == NULL) - { - ERROR_LOG(VIDEO, "Could not choose visual (glXChooseVisual)"); - exit(0); - } - } - } - else - NOTICE_LOG(VIDEO, "Got Doublebuffered Visual!"); - - glXQueryVersion(GLWin.dpy, &glxMajorVersion, &glxMinorVersion); - NOTICE_LOG(VIDEO, "glX-Version %d.%d", glxMajorVersion, glxMinorVersion); - // Create a GLX context. - GLWin.ctx = glXCreateContext(GLWin.dpy, vi, 0, GL_TRUE); - if(!GLWin.ctx) - { - PanicAlert("Couldn't Create GLX context.Quit"); - exit(0); // TODO: Don't bring down entire Emu - } - - if (GLWin.parent == 0) - GLWin.parent = RootWindow(GLWin.dpy, vi->screen); - // Create a color map. - cmap = XCreateColormap(GLWin.dpy, GLWin.parent, vi->visual, AllocNone); - GLWin.attr.colormap = cmap; - GLWin.attr.border_pixel = 0; - XkbSetDetectableAutoRepeat(GLWin.dpy, True, NULL); - - // Create a window in window mode - GLWin.attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | - StructureNotifyMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask; - GLWin.win = XCreateWindow(GLWin.dpy, GLWin.parent, - xPos, yPos, _twidth, _theight, 0, vi->depth, InputOutput, vi->visual, - CWBorderPixel | CWColormap | CWEventMask, &GLWin.attr); - // Only set window title and handle wm_delete_events if in windowed mode - wmDelete = XInternAtom(GLWin.dpy, "WM_DELETE_WINDOW", True); - XSetWMProtocols(GLWin.dpy, GLWin.win, &wmDelete, 1); - XSetStandardProperties(GLWin.dpy, GLWin.win, "GPU", - "GPU", None, NULL, 0, NULL); - XMapRaised(GLWin.dpy, GLWin.win); - - VideoWindowHandle() = (void *)GLWin.win; -#endif - return true; -} - -bool OpenGL_MakeCurrent() -{ -#if defined(USE_WX) && USE_WX - return GLWin.glCanvas->SetCurrent(*GLWin.glCtxt); -#elif defined(_WIN32) - return wglMakeCurrent(hDC,hRC) ? true : false; -#elif defined(HAVE_X11) && HAVE_X11 - Core::Callback_VideoGetWindowSize(GLWin.x, GLWin.y, (int&)GLWin.width, (int&)GLWin.height); - XMoveResizeWindow(GLWin.dpy, GLWin.win, GLWin.x, GLWin.y, GLWin.width, GLWin.height); - return glXMakeCurrent(GLWin.dpy, GLWin.win, GLWin.ctx); -#endif - return true; -} -// Update window width, size and etc. Called from Render.cpp -void OpenGL_Update() -{ -#if defined(USE_WX) && USE_WX - int width, height; - - GLWin.panel->GetSize(&width, &height); - if (width == s_backbuffer_width && height == s_backbuffer_height) - return; - - GLWin.glCanvas->SetFocus(); - GLWin.glCanvas->SetSize(0, 0, width, height); - GLWin.glCtxt->SetCurrent(*GLWin.glCanvas); - s_backbuffer_width = width; - s_backbuffer_height = height; - -#elif defined(_WIN32) - RECT rcWindow; - if (!EmuWindow::GetParentWnd()) - { - // We are not rendering to a child window - use client size. - GetClientRect(EmuWindow::GetWnd(), &rcWindow); - } - else - { - // We are rendering to a child window - use parent size. - GetWindowRect(EmuWindow::GetParentWnd(), &rcWindow); - } - - // Get the new window width and height - // See below for documentation - int width = rcWindow.right - rcWindow.left; - int height = rcWindow.bottom - rcWindow.top; - - // If we are rendering to a child window - if (EmuWindow::GetParentWnd() != 0) - ::MoveWindow(EmuWindow::GetWnd(), 0, 0, width, height, FALSE); - - s_backbuffer_width = width; - s_backbuffer_height = height; - -#elif defined(HAVE_X11) && HAVE_X11 - // We just check all of our events here - XEvent event; - int num_events; - for (num_events = XPending(GLWin.dpy);num_events > 0;num_events--) { - XNextEvent(GLWin.dpy, &event); - switch(event.type) { - case ConfigureNotify: - Window winDummy; - unsigned int borderDummy, depthDummy; - XGetGeometry(GLWin.dpy, GLWin.win, &winDummy, &GLWin.x, &GLWin.y, - &GLWin.width, &GLWin.height, &borderDummy, &depthDummy); - s_backbuffer_width = GLWin.width; - s_backbuffer_height = GLWin.height; - break; - case ClientMessage: - if ((unsigned long) event.xclient.data.l[0] == XInternAtom(GLWin.dpy, "WM_DELETE_WINDOW", False)) - Core::Callback_CoreMessage(WM_USER_STOP); - if ((unsigned long) event.xclient.data.l[0] == XInternAtom(GLWin.dpy, "RESIZE", False)) - XMoveResizeWindow(GLWin.dpy, GLWin.win, event.xclient.data.l[1], - event.xclient.data.l[2], event.xclient.data.l[3], event.xclient.data.l[4]); - return; - break; - default: - break; - } - } - return; -#endif -} - - -// Close plugin -void OpenGL_Shutdown() -{ -#if defined(USE_WX) && USE_WX - GLWin.glCanvas->Hide(); - // XXX GLWin.glCanvas->Destroy(); - // XXX delete GLWin.glCtxt; -#elif defined(_WIN32) - if (hRC) // Do We Have A Rendering Context? - { - if (!wglMakeCurrent(NULL,NULL)) // Are We Able To Release The DC And RC Contexts? - { - // [F|RES]: if this fails i dont see the message box and - // cant get out of the modal state so i disable it. - // This function fails only if i render to main window - // MessageBox(NULL,"Release Of DC And RC Failed.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION); - } - - if (!wglDeleteContext(hRC)) // Are We Able To Delete The RC? - { - ERROR_LOG(VIDEO, "Release Rendering Context Failed."); - } - hRC = NULL; // Set RC To NULL - } - - if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC)) // Are We Able To Release The DC - { - ERROR_LOG(VIDEO, "Release Device Context Failed."); - hDC = NULL; // Set DC To NULL - } -#elif defined(HAVE_X11) && HAVE_X11 - if (GLWin.ctx) - { - if (!glXMakeCurrent(GLWin.dpy, None, NULL)) - { - ERROR_LOG(VIDEO, "Could not release drawing context.\n"); - } - XUnmapWindow(GLWin.dpy, GLWin.win); - glXDestroyContext(GLWin.dpy, GLWin.ctx); - XCloseDisplay(GLWin.dpy); - GLWin.ctx = NULL; - } -#endif -} - -GLuint OpenGL_ReportGLError(const char *function, const char *file, int line) -{ - GLint err = glGetError(); - if (err != GL_NO_ERROR) - { - ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x - %s\n", file, line, function, err, gluErrorString(err)); - } - return err; -} - -void OpenGL_ReportARBProgramError() -{ - const GLubyte* pstr = glGetString(GL_PROGRAM_ERROR_STRING_ARB); - if (pstr != NULL && pstr[0] != 0) - { - GLint loc = 0; - glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &loc); - ERROR_LOG(VIDEO, "program error at %d: ", loc); - ERROR_LOG(VIDEO, "%s", (char*)pstr); - ERROR_LOG(VIDEO, "\n"); - } -} - -bool OpenGL_ReportFBOError(const char *function, const char *file, int line) -{ - unsigned int fbo_status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); - if (fbo_status != GL_FRAMEBUFFER_COMPLETE_EXT) - { - const char *error = "-"; - switch (fbo_status) - { - case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: error = "INCOMPLETE_ATTACHMENT_EXT"; break; - case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: error = "INCOMPLETE_MISSING_ATTACHMENT_EXT"; break; - case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: error = "INCOMPLETE_DIMENSIONS_EXT"; break; - case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: error = "INCOMPLETE_FORMATS_EXT"; break; - case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: error = "INCOMPLETE_DRAW_BUFFER_EXT"; break; - case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: error = "INCOMPLETE_READ_BUFFER_EXT"; break; - case GL_FRAMEBUFFER_UNSUPPORTED_EXT: error = "UNSUPPORTED_EXT"; break; - } - ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL FBO error - %s\n", file, line, function, error); - return false; - } - return true; -} -#endif diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWGLUtil.h b/Source/Plugins/Plugin_VideoSoftware/Src/SWGLUtil.h deleted file mode 100644 index e28499b4b5..0000000000 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWGLUtil.h +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright (C) 2003-2009 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ - - -#ifndef _GLINIT_H_ -#define _GLINIT_H_ - -#include -#include "SWVideoConfig.h" - -#ifdef _WIN32 -#define GLEW_STATIC -#include -#include -#elif defined HAVE_X11 && HAVE_X11 -#include -#include -#include -#include -#include -#elif defined __APPLE__ -#include -#import -#endif - -#if defined USE_WX && USE_WX -#include "wx/wx.h" -#include "wx/glcanvas.h" -#endif - -#ifndef GL_DEPTH24_STENCIL8_EXT // allows FBOs to support stencils -#define GL_DEPTH_STENCIL_EXT 0x84F9 -#define GL_UNSIGNED_INT_24_8_EXT 0x84FA -#define GL_DEPTH24_STENCIL8_EXT 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 -#endif - -#ifndef _WIN32 - -#include - -typedef struct { -#if defined(USE_WX) && USE_WX - wxGLCanvas *glCanvas; - wxGLContext *glCtxt; - wxPanel *panel; -#elif defined(HAVE_X11) && HAVE_X11 - int screen; - Window win; - Window parent; - Display *dpy; - GLXContext ctx; - XSetWindowAttributes attr; - int x, y; - unsigned int width, height; -#endif -} GLWindow; - -extern GLWindow GLWin; - -#endif - -// Public OpenGL util - -// Initialization / upkeep -bool OpenGL_Create(int _width, int _height); -void OpenGL_Shutdown(); -void OpenGL_Update(); -bool OpenGL_MakeCurrent(); -void OpenGL_SwapBuffers(); - -// Get status -u32 OpenGL_GetBackbufferWidth(); -u32 OpenGL_GetBackbufferHeight(); - -// Set things -void OpenGL_SetWindowText(const char *text); - -// Error reporting - use the convenient macros. -void OpenGL_ReportARBProgramError(); -GLuint OpenGL_ReportGLError(const char *function, const char *file, int line); -bool OpenGL_ReportFBOError(const char *function, const char *file, int line); - -#if defined(_DEBUG) || defined(DEBUGFAST) -#define GL_REPORT_ERROR() OpenGL_ReportGLError (__FUNCTION__, __FILE__, __LINE__) -#define GL_REPORT_PROGRAM_ERROR() OpenGL_ReportARBProgramError() -#define GL_REPORT_FBO_ERROR() OpenGL_ReportFBOError (__FUNCTION__, __FILE__, __LINE__) -#define GL_REPORT_ERRORD() OpenGL_ReportGLError(__FUNCTION__, __FILE__, __LINE__) -#else -#define GL_REPORT_ERROR() GL_NO_ERROR -#define GL_REPORT_PROGRAM_ERROR() -#define GL_REPORT_FBO_ERROR() -#define GL_REPORT_ERRORD() -#endif - -#endif // _GLINIT_H_ diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp index 80ca257803..276628bf4c 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp @@ -18,7 +18,7 @@ #include "Common.h" #include "Core.h" -#include "SWGLUtil.h" +#include "../../Plugin_VideoOGL/Src/GLUtil.h" #include "SWRenderer.h" #include "SWStatistics.h" #include "../../Plugin_VideoOGL/Src/RasterFont.h" diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp index 7e85fb3580..56aa48cc3b 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp @@ -151,7 +151,7 @@ bool VideoBackend::Video_Screenshot(const char *_szFilename) // ------------------------------- void VideoBackend::Video_EnterLoop() { - Fifo_EnterLoop(); + Fifo_EnterLoop(); } void VideoBackend::Video_ExitLoop() @@ -169,7 +169,7 @@ void VideoBackend::Video_ClearMessages() void VideoBackend::Video_SetRendering(bool bEnabled) { - Fifo_SetRendering(bEnabled); + Fifo_SetRendering(bEnabled); } void VideoBackend::Video_WaitForFrameFinish(void) @@ -185,4 +185,31 @@ void VideoBackend::Video_AbortFrame(void) { } +// Draw messages on top of the screen +unsigned int VideoBackend::PeekMessages() +{ +#ifdef _WIN32 + // TODO: peekmessage + MSG msg; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_QUIT) + return FALSE; + TranslateMessage(&msg); + DispatchMessage(&msg); + } + return TRUE; +#else + return false; +#endif +} + +// Show the current FPS +void VideoBackend::UpdateFPSDisplay(const char *text) +{ + char temp[100]; + snprintf(temp, sizeof temp, "%s | Software | %s", svn_rev_str, text); + OpenGL_SetWindowText(temp); +} + }