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

Explicit dependency on libvideo.

Browse Source 
Back out r6960 for now. The wxGLCanvas may need to be persistent
and owned by DolphinWX in the rendertomain case.

Disambiguate SWVideoConfig.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6962 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2011-01-29 06:26:03 +00:00
parent 45024133e2
commit 9b3920d1a9
20 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Src/SConscript
View File

@ -69,6 +69,8 @@ elif sys.platform == 'darwin':
else: else:
exe += 'NoGUI' exe += 'NoGUI'
env.Depends(exe, env['libvideo'])
env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' + env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' +
'Frameworks/Cg.framework', source = [ 'Frameworks/Cg.framework', source = [
'#Externals/Cg/Cg.framework/Cg', '#Externals/Cg/Cg.framework/Cg',

5
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -325,6 +325,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
wxPoint(0, 0), wxSize(_twidth, _theight)); wxPoint(0, 0), wxSize(_twidth, _theight));
GLWin.glCanvas->Show(true); GLWin.glCanvas->Show(true);
if (GLWin.glCtxt == NULL) // XXX dirty hack
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
#elif defined(__APPLE__) #elif defined(__APPLE__)
@ -570,8 +571,8 @@ void OpenGL_Shutdown()
{ {
#if defined(USE_WX) && USE_WX #if defined(USE_WX) && USE_WX
GLWin.glCanvas->Hide(); GLWin.glCanvas->Hide();
GLWin.glCanvas->Destroy(); // XXX GLWin.glCanvas->Destroy();
delete GLWin.glCtxt; // XXX delete GLWin.glCtxt;
#elif defined(__APPLE__) #elif defined(__APPLE__)
[GLWin.cocoaWin close]; [GLWin.cocoaWin close];
[GLWin.cocoaCtx clearDrawable]; [GLWin.cocoaCtx clearDrawable];

2
Source/Plugins/Plugin_VideoSoftware/CMakeLists.txt
View File

@ -20,7 +20,7 @@ set(SRCS Src/BPMemLoader.cpp
Src/TextureSampler.cpp Src/TextureSampler.cpp
Src/TransformUnit.cpp Src/TransformUnit.cpp
Src/VertexLoader.cpp Src/VertexLoader.cpp
Src/VideoConfig.cpp Src/SWVideoConfig.cpp
Src/XFMemLoader.cpp) Src/XFMemLoader.cpp)
if(wxWidgets_FOUND) if(wxWidgets_FOUND)

4
Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj
View File

@ -648,11 +648,11 @@
> >
</File> </File>
<File <File
RelativePath=".\Src\VideoConfig.cpp" RelativePath=".\Src\SWVideoConfig.cpp"
> >
</File> </File>
<File <File
RelativePath=".\Src\VideoConfig.h" RelativePath=".\Src\SWVideoConfig.h"
> >
</File> </File>
<File <File

4
Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
View File

@ -193,7 +193,7 @@
<ClCompile Include="Src\TransformUnit.cpp" /> <ClCompile Include="Src\TransformUnit.cpp" />
<ClCompile Include="Src\VertexFormatConverter.cpp" /> <ClCompile Include="Src\VertexFormatConverter.cpp" />
<ClCompile Include="Src\VertexLoader.cpp" /> <ClCompile Include="Src\VertexLoader.cpp" />
<ClCompile Include="Src\VideoConfig.cpp" /> <ClCompile Include="Src\SWVideoConfig.cpp" />
<ClCompile Include="Src\VideoConfigDialog.cpp" /> <ClCompile Include="Src\VideoConfigDialog.cpp" />
<ClCompile Include="Src\Win32.cpp" /> <ClCompile Include="Src\Win32.cpp" />
<ClCompile Include="Src\XFMemLoader.cpp" /> <ClCompile Include="Src\XFMemLoader.cpp" />
@ -226,7 +226,7 @@
<ClInclude Include="Src\VertexFormatConverter.h" /> <ClInclude Include="Src\VertexFormatConverter.h" />
<ClInclude Include="Src\VertexLoader.h" /> <ClInclude Include="Src\VertexLoader.h" />
<ClInclude Include="Src\VertexLoader_Position.h" /> <ClInclude Include="Src\VertexLoader_Position.h" />
<ClInclude Include="Src\VideoConfig.h" /> <ClInclude Include="Src\SWVideoConfig.h" />
<ClInclude Include="Src\VideoConfigDialog.h" /> <ClInclude Include="Src\VideoConfigDialog.h" />
<ClInclude Include="Src\Win32.h" /> <ClInclude Include="Src\Win32.h" />
<ClInclude Include="Src\XFMemLoader.h" /> <ClInclude Include="Src\XFMemLoader.h" />

2
Source/Plugins/Plugin_VideoSoftware/Src/Clipper.cpp
View File

@ -54,7 +54,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "XFMemLoader.h" #include "XFMemLoader.h"
#include "BPMemLoader.h" #include "BPMemLoader.h"
#include "Statistics.h" #include "Statistics.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
namespace Clipper namespace Clipper

2
Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
View File

@ -38,7 +38,7 @@ u8* g_pVideoData;
#else #else
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include "OpcodeDecoding.h" #include "OpcodeDecoding.h"
#include "VideoCommon.h" #include "VideoCommon.h"
extern u8* g_pVideoData; extern u8* g_pVideoData;

2
Source/Plugins/Plugin_VideoSoftware/Src/DebugUtil.cpp
View File

@ -21,7 +21,7 @@
#include "DebugUtil.h" #include "DebugUtil.h"
#include "BPMemLoader.h" #include "BPMemLoader.h"
#include "TextureSampler.h" #include "TextureSampler.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include "EfbInterface.h" #include "EfbInterface.h"
#include "Statistics.h" #include "Statistics.h"
#include "HwRasterizer.h" #include "HwRasterizer.h"

2
Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
View File

@ -22,7 +22,7 @@
#include "Renderer.h" #include "Renderer.h"
#include "TextureEncoder.h" #include "TextureEncoder.h"
#include "Statistics.h" #include "Statistics.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include "DebugUtil.h" #include "DebugUtil.h"
#include "HwRasterizer.h" #include "HwRasterizer.h"
#include "CommandProcessor.h" #include "CommandProcessor.h"

7
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
View File

@ -16,7 +16,7 @@
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "main.h" #include "main.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include "IniFile.h" #include "IniFile.h"
#include "Setup.h" #include "Setup.h"
@ -122,6 +122,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL, GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
wxPoint(0, 0), wxSize(_twidth, _theight)); wxPoint(0, 0), wxSize(_twidth, _theight));
GLWin.glCanvas->Show(true); GLWin.glCanvas->Show(true);
if (GLWin.glCtxt == NULL) // XXX dirty hack
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas); GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
#elif defined(_WIN32) #elif defined(_WIN32)
@ -384,8 +385,8 @@ void OpenGL_Shutdown()
{ {
#if defined(USE_WX) && USE_WX #if defined(USE_WX) && USE_WX
GLWin.glCanvas->Hide(); GLWin.glCanvas->Hide();
GLWin.glCanvas->Destroy(); // XXX GLWin.glCanvas->Destroy();
delete GLWin.glCtxt; // XXX delete GLWin.glCtxt;
#elif defined(_WIN32) #elif defined(_WIN32)
if (hRC) // Do We Have A Rendering Context? if (hRC) // Do We Have A Rendering Context?
{ {

2
Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h
View File

@ -20,7 +20,7 @@
#define _GLINIT_H_ #define _GLINIT_H_
#include <string> #include <string>
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include "pluginspecs_video.h" #include "pluginspecs_video.h"
#ifdef _WIN32 #ifdef _WIN32

2
Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
View File

@ -24,7 +24,7 @@
#include "XFMemLoader.h" #include "XFMemLoader.h"
#include "Tev.h" #include "Tev.h"
#include "Statistics.h" #include "Statistics.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
#define BLOCK_SIZE 2 #define BLOCK_SIZE 2

2
Source/Plugins/Plugin_VideoSoftware/Src/SConscript
View File

@ -27,7 +27,7 @@ files = [
'TextureSampler.cpp', 'TextureSampler.cpp',
'TransformUnit.cpp', 'TransformUnit.cpp',
'VertexLoader.cpp', 'VertexLoader.cpp',
'VideoConfig.cpp', 'SWVideoConfig.cpp',
'XFMemLoader.cpp', 'XFMemLoader.cpp',
] ]

2
Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.cpp → Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.cpp
View File

@ -17,7 +17,7 @@
#include "FileUtil.h" #include "FileUtil.h"
#include "IniFile.h" #include "IniFile.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
SWVideoConfig g_SWVideoConfig; SWVideoConfig g_SWVideoConfig;

0
Source/Plugins/Plugin_VideoSoftware/Src/VideoConfig.h → Source/Plugins/Plugin_VideoSoftware/Src/SWVideoConfig.h
View File

2
Source/Plugins/Plugin_VideoSoftware/Src/Statistics.h
View File

@ -16,7 +16,7 @@
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "CommonTypes.h" #include "CommonTypes.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
#ifndef _STATISTICS_H #ifndef _STATISTICS_H
#define _STATISTICS_H #define _STATISTICS_H

2
Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
View File

@ -21,7 +21,7 @@
#include "EfbInterface.h" #include "EfbInterface.h"
#include "TextureSampler.h" #include "TextureSampler.h"
#include "Statistics.h" #include "Statistics.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include "DebugUtil.h" #include "DebugUtil.h"
#include <math.h> #include <math.h>

2
Source/Plugins/Plugin_VideoSoftware/Src/VideoConfigDialog.h
View File

@ -21,7 +21,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include <wx/wx.h> #include <wx/wx.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>

2
Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
View File

@ -23,7 +23,7 @@
#include <wx/dialog.h> #include <wx/dialog.h>
#include <wx/aboutdlg.h> #include <wx/aboutdlg.h>
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include "main.h" #include "main.h"
#include "Win32.h" #include "Win32.h"

2
Source/Plugins/Plugin_VideoSoftware/Src/main.cpp
View File

@ -25,7 +25,7 @@
#include "CommandProcessor.h" #include "CommandProcessor.h"
#include "OpcodeDecoder.h" #include "OpcodeDecoder.h"
#include "VideoConfig.h" #include "SWVideoConfig.h"
#include "PixelEngine.h" #include "PixelEngine.h"
#include "CommandProcessor.h" #include "CommandProcessor.h"
#include "BPMemLoader.h" #include "BPMemLoader.h"