mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-02-06 12:40:24 +00:00
Fix OS X build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7298 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
7eade75476
commit
f20731b1c3
@ -1343,7 +1343,7 @@ void CFrame::OnLoadWiiMenu(wxCommandEvent& event)
|
|||||||
char sysmenuRegion = _Loader.GetCountryChar();
|
char sysmenuRegion = _Loader.GetCountryChar();
|
||||||
|
|
||||||
GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->Enable();
|
GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->Enable();
|
||||||
GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->SetText(wxString::Format(_("Load Wii System Menu %d%c"), sysmenuVersion, sysmenuRegion));
|
GetMenuBar()->FindItem(IDM_LOAD_WII_MENU)->SetItemLabel(wxString::Format(_("Load Wii System Menu %d%c"), sysmenuVersion, sysmenuRegion));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -685,6 +685,7 @@ PC_TexFormat GetPC_TexFormat(int texformat, int tlutfmt)
|
|||||||
//need to add DXT support too
|
//need to add DXT support too
|
||||||
PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt)
|
PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int height, int texformat, int tlutaddr, int tlutfmt)
|
||||||
{
|
{
|
||||||
|
#ifdef _OPENMP
|
||||||
//Dont use multithreading in small Textures
|
//Dont use multithreading in small Textures
|
||||||
if(width > 127 && height > 127)
|
if(width > 127 && height > 127)
|
||||||
{
|
{
|
||||||
@ -695,6 +696,7 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh
|
|||||||
{
|
{
|
||||||
omp_set_num_threads(1);
|
omp_set_num_threads(1);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
int Wsteps4 = (width + 3) / 4;
|
int Wsteps4 = (width + 3) / 4;
|
||||||
int Wsteps8 = (width + 7) / 8;
|
int Wsteps8 = (width + 7) / 8;
|
||||||
switch (texformat)
|
switch (texformat)
|
||||||
@ -959,6 +961,7 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh
|
|||||||
|
|
||||||
PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int height, int texformat, int tlutaddr, int tlutfmt)
|
PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int height, int texformat, int tlutaddr, int tlutfmt)
|
||||||
{
|
{
|
||||||
|
#ifdef _OPENMP
|
||||||
if(width > 127 && height > 127)
|
if(width > 127 && height > 127)
|
||||||
{
|
{
|
||||||
//don't span to many threads they will kill the rest of the emu :)
|
//don't span to many threads they will kill the rest of the emu :)
|
||||||
@ -968,6 +971,7 @@ PC_TexFormat TexDecoder_Decode_RGBA(u32 * dst, const u8 * src, int width, int he
|
|||||||
{
|
{
|
||||||
omp_set_num_threads(1);
|
omp_set_num_threads(1);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
int Wsteps4 = (width + 3) / 4;
|
int Wsteps4 = (width + 3) / 4;
|
||||||
int Wsteps8 = (width + 7) / 8;
|
int Wsteps8 = (width + 7) / 8;
|
||||||
switch (texformat)
|
switch (texformat)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user