ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nothing special >_> 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4161 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
daco65 2009-09-02 15:38:04 +00:00
parent 6f4a0903c0
commit dd7eba0bb9
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -93,7 +93,7 @@ extern "C" {
wxCheatsWindow* CheatsWindow; wxCheatsWindow* CheatsWindow;
wxInfoWindow* InfoWindow; wxInfoWindow* InfoWindow;
///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////
// Create menu items // Create menu items
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void CFrame::CreateMenu() void CFrame::CreateMenu()
@ -237,10 +237,10 @@ void CFrame::CreateMenu()
// Associate the menu bar with the frame // Associate the menu bar with the frame
SetMenuBar(menuBar); SetMenuBar(menuBar);
} }
///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////
// Create toolbar items // Create toolbar items
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar) void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
@ -249,6 +249,7 @@ void CFrame::PopulateToolbar(wxAuiToolBar* ToolBar)
h = m_Bitmaps[Toolbar_FileOpen].GetHeight(); h = m_Bitmaps[Toolbar_FileOpen].GetHeight();
ToolBar->SetToolBitmapSize(wxSize(w, h)); ToolBar->SetToolBitmapSize(wxSize(w, h));
ToolBar->AddTool(wxID_OPEN, _T("Open"), m_Bitmaps[Toolbar_FileOpen], _T("Open file...")); ToolBar->AddTool(wxID_OPEN, _T("Open"), m_Bitmaps[Toolbar_FileOpen], _T("Open file..."));
ToolBar->AddTool(wxID_REFRESH, _T("Refresh"), m_Bitmaps[Toolbar_Refresh], _T("Refresh")); ToolBar->AddTool(wxID_REFRESH, _T("Refresh"), m_Bitmaps[Toolbar_Refresh], _T("Refresh"));
ToolBar->AddTool(IDM_BROWSE, _T("Browse"), m_Bitmaps[Toolbar_Browse], _T("Browse for an ISO directory...")); ToolBar->AddTool(IDM_BROWSE, _T("Browse"), m_Bitmaps[Toolbar_Browse], _T("Browse for an ISO directory..."));

11
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
View File

@ -106,8 +106,8 @@ void TextureCache::Cleanup()
TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width, int height, int format, int tlutaddr, int tlutfmt) TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width, int height, int format, int tlutaddr, int tlutfmt)
{ {
if (address == 0) if (address == 0) return NULL;
return NULL;
TexCache::iterator iter = textures.find(address); TexCache::iterator iter = textures.find(address);
u8 *ptr = g_VideoInitialize.pGetMemoryPointer(address); u8 *ptr = g_VideoInitialize.pGetMemoryPointer(address);
@ -116,8 +116,9 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
u32 palhash = 0xc0debabe; u32 palhash = 0xc0debabe;
if (palSize) if (palSize)
{ {
if (palSize>16) // TODO: Share this code with the GL plugin.
palSize = 16; //let's not do excessive amount of checking if (palSize > 32)
palSize = 32; //let's not do excessive amount of checking
u8 *pal = g_VideoInitialize.pGetMemoryPointer(tlutaddr); u8 *pal = g_VideoInitialize.pGetMemoryPointer(tlutaddr);
if (pal != 0) if (pal != 0)
{ {
@ -184,7 +185,7 @@ TextureCache::TCacheEntry *TextureCache::Load(int stage, u32 address, int width,
d3d_fmt = D3DFMT_R5G6B5; d3d_fmt = D3DFMT_R5G6B5;
break; break;
case PC_TEX_FMT_IA4_AS_IA8: case PC_TEX_FMT_IA4_AS_IA8:
d3d_fmt = D3DFMT_A4L4; d3d_fmt = D3DFMT_A8L8; //D3DFMT_A4L4;
break; break;
case PC_TEX_FMT_I8: case PC_TEX_FMT_I8:
case PC_TEX_FMT_I4_AS_I8: case PC_TEX_FMT_I4_AS_I8: