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

fix typo in unused function, try to fix linux 32-bit opengl 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@117 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-07-31 21:23:30 +00:00
parent 0c21d95606
commit 3b4a9e06c2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/ABI.cpp
View File

@ -76,7 +76,7 @@ void ABI_CallFunctionR(void *func, X64Reg reg1) {
void ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2) void ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2)
{ {
if (arg1.IsSimpleReg(ABI_PARAM1)) if (!arg1.IsSimpleReg(ABI_PARAM1))
MOV(32, R(ABI_PARAM1), arg1); MOV(32, R(ABI_PARAM1), arg1);
MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM2), Imm32(param2));
CALL(func); CALL(func);

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

@ -539,7 +539,10 @@ void VertexLoader::ProcessFormat()
#else #else
PUSH(32, Imm32(id)); PUSH(32, Imm32(id));
CALL((void *)glClientActiveTexture); CALL((void *)glClientActiveTexture);
// don't inc stack // don't inc stack on windows, stdcall
#ifndef _WIN32
ADD(32, R(ESP), Imm8(4));
#endif
#endif #endif
if( m_components&(VB_HAS_TEXMTXIDX0<<i) ) { if( m_components&(VB_HAS_TEXMTXIDX0<<i) ) {
if( tc[i] != NOT_PRESENT ) { if( tc[i] != NOT_PRESENT ) {