From 3b4a9e06c2855c7b6ce708eed2d2bb6ccc05b274 Mon Sep 17 00:00:00 2001 From: hrydgard Date: Thu, 31 Jul 2008 21:23:30 +0000 Subject: [PATCH] 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 --- Source/Core/Common/Src/ABI.cpp | 2 +- Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/ABI.cpp b/Source/Core/Common/Src/ABI.cpp index ee2ddb65da..78162f61f9 100644 --- a/Source/Core/Common/Src/ABI.cpp +++ b/Source/Core/Common/Src/ABI.cpp @@ -76,7 +76,7 @@ void ABI_CallFunctionR(void *func, X64Reg reg1) { 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_PARAM2), Imm32(param2)); CALL(func); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp index 8b870afe46..54294598e5 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp @@ -539,7 +539,10 @@ void VertexLoader::ProcessFormat() #else PUSH(32, Imm32(id)); CALL((void *)glClientActiveTexture); - // don't inc stack + // don't inc stack on windows, stdcall +#ifndef _WIN32 + ADD(32, R(ESP), Imm8(4)); +#endif #endif if( m_components&(VB_HAS_TEXMTXIDX0<