The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 11:32:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

When the gfx debugger is saving shaders make sure the directory exists.

Browse Source 
Make sure the gfx debugger unpauses when the emulator is stopped.
When a wad is installed make sure directories exist.
For the cmake build if a header is not provided in the check_lib macro don't check for it, and assume pkg-config was supposed to work.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6581 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-12-14 23:19:34 +00:00
parent 35fef1f173
commit 76d9209ad4
7 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeTests/CheckLib.cmake
View File

@ -34,7 +34,11 @@ macro(check_lib var lib)
_internal_message("${lib} found") _internal_message("${lib} found")
else() else()
find_library(${var} ${lib}) find_library(${var} ${lib})
find_path(${var}_INCLUDE ${_arg_list}) if(_arg_list)
find_path(${var}_INCLUDE ${_arg_list})
else()
set(${var}_INCLUDE FALSE)
endif()
if(${var} AND ${var}_INCLUDE) if(${var} AND ${var}_INCLUDE)
include_directories(${${var}_INCLUDE}) include_directories(${${var}_INCLUDE})
_internal_message("${lib} found") _internal_message("${lib} found")

1
Source/Core/Core/Src/Boot/Boot_WiiWAD.cpp
View File

@ -132,6 +132,7 @@ bool CBoot::Install_WiiWAD(const char* _pFilename)
if (!File::Exists(APPFileName)) if (!File::Exists(APPFileName))
{ {
File::CreateFullPath(APPFileName);
FILE* pAPPFile = fopen(APPFileName, "wb"); FILE* pAPPFile = fopen(APPFileName, "wb");
if (pAPPFile == NULL) if (pAPPFile == NULL)
{ {

4
Source/Core/Core/Src/HW/SI_Device.cpp
View File

@ -38,11 +38,11 @@ int ISIDevice::RunBuffer(u8* _pBuffer, int _iLength)
if ((num % 8) == 0) if ((num % 8) == 0)
{ {
DEBUG_LOG(SERIALINTERFACE, szTemp); DEBUG_LOG(SERIALINTERFACE, "%s", szTemp);
szTemp[0] = '\0'; szTemp[0] = '\0';
} }
} }
DEBUG_LOG(SERIALINTERFACE, szTemp); DEBUG_LOG(SERIALINTERFACE, "%s", szTemp);
#endif #endif
return 0; return 0;
}; };

3
Source/Core/Core/Src/HW/SI_DeviceGBA.cpp
View File

@ -134,7 +134,8 @@ void GBASockServer::Transfer(char* si_buffer)
else if (cmd == CMD_WRITE) else if (cmd == CMD_WRITE)
num_expecting = 1; num_expecting = 1;
if (num_received != num_expecting) if (num_received != num_expecting)
ERROR_LOG(SERIALINTERFACE, "%x:%x:%x", (u8)cmd, num_received, num_expecting); ERROR_LOG(SERIALINTERFACE, "%x:%x:%x", (u8)cmd,
(unsigned int)num_received, (unsigned int)num_expecting);
#endif #endif
si_buffer[0] = current_data[3]; si_buffer[0] = current_data[3];

4
Source/Core/VideoCommon/Src/Debugger.cpp
View File

@ -94,7 +94,7 @@ void ContinueGFXDebugger()
void GFXDebuggerBase::DumpPixelShader(const char* path) void GFXDebuggerBase::DumpPixelShader(const char* path)
{ {
char filename[MAX_PATH]; char filename[MAX_PATH];
sprintf(filename, "%s/dump_ps.txt", path); sprintf(filename, "%sdump_ps.txt", path);
std::string output; std::string output;
bool useDstAlpha = bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24; bool useDstAlpha = bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate && bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
@ -126,7 +126,7 @@ void GFXDebuggerBase::DumpPixelShader(const char* path)
void GFXDebuggerBase::DumpVertexShader(const char* path) void GFXDebuggerBase::DumpVertexShader(const char* path)
{ {
char filename[MAX_PATH]; char filename[MAX_PATH];
sprintf(filename, "%s/dump_vs_consts.txt", path); sprintf(filename, "%sdump_vs_consts.txt", path);
File::CreateEmptyFile(filename); File::CreateEmptyFile(filename);
File::WriteStringToFile(true, GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename); File::WriteStringToFile(true, GenerateVertexShaderCode(g_nativeVertexFmt->m_components, g_ActiveConfig.backend_info.APIType), filename);

2
Source/Core/VideoUICommon/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(SRCS Src/VideoConfigDiag.cpp set(SRCS Src/VideoConfigDiag.cpp
Src/DebuggerPanel.cpp) Src/DebuggerPanel.cpp)
add_library(videouicommon STATIC ${SRCS}) add_library(videouicommon STATIC ${SRCS})
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

9
Source/Core/VideoUICommon/Src/DebuggerPanel.cpp
View File

@ -54,7 +54,7 @@ GFXDebuggerPanel::GFXDebuggerPanel(wxWindow *parent, wxWindowID id, const wxPoin
GFXDebuggerPanel::~GFXDebuggerPanel() GFXDebuggerPanel::~GFXDebuggerPanel()
{ {
SaveSettings(); GFXDebuggerPauseFlag = false;
} }
void GFXDebuggerPanel::OnClose(wxCloseEvent& event) void GFXDebuggerPanel::OnClose(wxCloseEvent& event)
@ -249,10 +249,9 @@ void GFXDebuggerPanel::OnPauseAtNextFrameButton(wxCommandEvent& event)
void GFXDebuggerPanel::OnDumpButton(wxCommandEvent& event) void GFXDebuggerPanel::OnDumpButton(wxCommandEvent& event)
{ {
char dump_path[MAX_PATH]; char dump_path[MAX_PATH];
sprintf(dump_path, "%sDebug/%s", File::GetUserPath(D_DUMP_IDX), globals->unique_id); sprintf(dump_path, "%sDebug/%s/", File::GetUserPath(D_DUMP_IDX), globals->unique_id);
if (!File::Exists(dump_path) || !File::IsDirectory(dump_path)) if (!File::CreateFullPath(dump_path))
if (!File::CreateDir(dump_path)) return;
return;
switch (m_pDumpList->GetSelection()) switch (m_pDumpList->GetSelection())
{ {