mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-09-21 03:41:42 +02:00
Explicit dependency on libvideo.
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
parent
45024133e2
commit
9b3920d1a9
20 changed files with 30 additions and 26 deletions
|
|
@ -69,6 +69,8 @@ elif sys.platform == 'darwin':
|
|||
else:
|
||||
exe += 'NoGUI'
|
||||
|
||||
env.Depends(exe, env['libvideo'])
|
||||
|
||||
env.Install('#' + env['prefix'] + '/Dolphin.app/Contents/' +
|
||||
'Frameworks/Cg.framework', source = [
|
||||
'#Externals/Cg/Cg.framework/Cg',
|
||||
|
|
|
|||
|
|
@ -325,7 +325,8 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
|
|||
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
|
||||
wxPoint(0, 0), wxSize(_twidth, _theight));
|
||||
GLWin.glCanvas->Show(true);
|
||||
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
||||
if (GLWin.glCtxt == NULL) // XXX dirty hack
|
||||
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
||||
|
||||
#elif defined(__APPLE__)
|
||||
NSOpenGLPixelFormatAttribute attr[2] = { NSOpenGLPFADoubleBuffer, 0 };
|
||||
|
|
@ -570,8 +571,8 @@ void OpenGL_Shutdown()
|
|||
{
|
||||
#if defined(USE_WX) && USE_WX
|
||||
GLWin.glCanvas->Hide();
|
||||
GLWin.glCanvas->Destroy();
|
||||
delete GLWin.glCtxt;
|
||||
// XXX GLWin.glCanvas->Destroy();
|
||||
// XXX delete GLWin.glCtxt;
|
||||
#elif defined(__APPLE__)
|
||||
[GLWin.cocoaWin close];
|
||||
[GLWin.cocoaCtx clearDrawable];
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ set(SRCS Src/BPMemLoader.cpp
|
|||
Src/TextureSampler.cpp
|
||||
Src/TransformUnit.cpp
|
||||
Src/VertexLoader.cpp
|
||||
Src/VideoConfig.cpp
|
||||
Src/SWVideoConfig.cpp
|
||||
Src/XFMemLoader.cpp)
|
||||
|
||||
if(wxWidgets_FOUND)
|
||||
|
|
|
|||
|
|
@ -648,11 +648,11 @@
|
|||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Src\VideoConfig.cpp"
|
||||
RelativePath=".\Src\SWVideoConfig.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Src\VideoConfig.h"
|
||||
RelativePath=".\Src\SWVideoConfig.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@
|
|||
<ClCompile Include="Src\TransformUnit.cpp" />
|
||||
<ClCompile Include="Src\VertexFormatConverter.cpp" />
|
||||
<ClCompile Include="Src\VertexLoader.cpp" />
|
||||
<ClCompile Include="Src\VideoConfig.cpp" />
|
||||
<ClCompile Include="Src\SWVideoConfig.cpp" />
|
||||
<ClCompile Include="Src\VideoConfigDialog.cpp" />
|
||||
<ClCompile Include="Src\Win32.cpp" />
|
||||
<ClCompile Include="Src\XFMemLoader.cpp" />
|
||||
|
|
@ -226,7 +226,7 @@
|
|||
<ClInclude Include="Src\VertexFormatConverter.h" />
|
||||
<ClInclude Include="Src\VertexLoader.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\Win32.h" />
|
||||
<ClInclude Include="Src\XFMemLoader.h" />
|
||||
|
|
@ -251,4 +251,4 @@
|
|||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
#include "XFMemLoader.h"
|
||||
#include "BPMemLoader.h"
|
||||
#include "Statistics.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
|
||||
|
||||
namespace Clipper
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ u8* g_pVideoData;
|
|||
|
||||
#else
|
||||
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
#include "OpcodeDecoding.h"
|
||||
#include "VideoCommon.h"
|
||||
extern u8* g_pVideoData;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include "DebugUtil.h"
|
||||
#include "BPMemLoader.h"
|
||||
#include "TextureSampler.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
#include "EfbInterface.h"
|
||||
#include "Statistics.h"
|
||||
#include "HwRasterizer.h"
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include "Renderer.h"
|
||||
#include "TextureEncoder.h"
|
||||
#include "Statistics.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
#include "DebugUtil.h"
|
||||
#include "HwRasterizer.h"
|
||||
#include "CommandProcessor.h"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "main.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
#include "IniFile.h"
|
||||
#include "Setup.h"
|
||||
|
||||
|
|
@ -122,7 +122,8 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _twidth, int _theight
|
|||
GLWin.glCanvas = new wxGLCanvas(GLWin.panel, wxID_ANY, NULL,
|
||||
wxPoint(0, 0), wxSize(_twidth, _theight));
|
||||
GLWin.glCanvas->Show(true);
|
||||
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
||||
if (GLWin.glCtxt == NULL) // XXX dirty hack
|
||||
GLWin.glCtxt = new wxGLContext(GLWin.glCanvas);
|
||||
|
||||
#elif defined(_WIN32)
|
||||
// Create rendering window in Windows
|
||||
|
|
@ -384,8 +385,8 @@ void OpenGL_Shutdown()
|
|||
{
|
||||
#if defined(USE_WX) && USE_WX
|
||||
GLWin.glCanvas->Hide();
|
||||
GLWin.glCanvas->Destroy();
|
||||
delete GLWin.glCtxt;
|
||||
// XXX GLWin.glCanvas->Destroy();
|
||||
// XXX delete GLWin.glCtxt;
|
||||
#elif defined(_WIN32)
|
||||
if (hRC) // Do We Have A Rendering Context?
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#define _GLINIT_H_
|
||||
|
||||
#include <string>
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
#include "pluginspecs_video.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include "XFMemLoader.h"
|
||||
#include "Tev.h"
|
||||
#include "Statistics.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
|
||||
|
||||
#define BLOCK_SIZE 2
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ files = [
|
|||
'TextureSampler.cpp',
|
||||
'TransformUnit.cpp',
|
||||
'VertexLoader.cpp',
|
||||
'VideoConfig.cpp',
|
||||
'SWVideoConfig.cpp',
|
||||
'XFMemLoader.cpp',
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
#include "FileUtil.h"
|
||||
#include "IniFile.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
|
||||
SWVideoConfig g_SWVideoConfig;
|
||||
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include "CommonTypes.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
|
||||
#ifndef _STATISTICS_H
|
||||
#define _STATISTICS_H
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include "EfbInterface.h"
|
||||
#include "TextureSampler.h"
|
||||
#include "Statistics.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
#include "DebugUtil.h"
|
||||
|
||||
#include <math.h>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
|
||||
#include <wx/wx.h>
|
||||
#include <wx/textctrl.h>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include <wx/dialog.h>
|
||||
#include <wx/aboutdlg.h>
|
||||
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
#include "main.h"
|
||||
#include "Win32.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include "CommandProcessor.h"
|
||||
#include "OpcodeDecoder.h"
|
||||
#include "VideoConfig.h"
|
||||
#include "SWVideoConfig.h"
|
||||
#include "PixelEngine.h"
|
||||
#include "CommandProcessor.h"
|
||||
#include "BPMemLoader.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue