mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-08 00:59:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into GLSL-master

Browse source 
the only commit on master is to fix vertexloader, so disable jit for osx
This commit is contained in:
degasus 2013-03-06 19:07:15 +01:00
commit 5dd502df3b
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/VideoCommon/Src/VertexLoader.cpp
View file

@ -44,8 +44,10 @@
#include "XFMemory.h" #include "XFMemory.h"
extern float GC_ALIGNED16(g_fProjectionMatrix[16]); extern float GC_ALIGNED16(g_fProjectionMatrix[16]);
#ifndef _M_GENERIC #ifndef _M_GENERIC
#ifndef __APPLE__
#define USE_JIT #define USE_JIT
#endif #endif
#endif
#define COMPILED_CODE_SIZE 4096 #define COMPILED_CODE_SIZE 4096
@ -87,9 +89,8 @@ static const float fractionTable[32] = {
1.0f / (1U << 24), 1.0f / (1U << 25), 1.0f / (1U << 26), 1.0f / (1U << 27), 1.0f / (1U << 24), 1.0f / (1U << 25), 1.0f / (1U << 26), 1.0f / (1U << 27),
1.0f / (1U << 28), 1.0f / (1U << 29), 1.0f / (1U << 30), 1.0f / (1U << 31), 1.0f / (1U << 28), 1.0f / (1U << 29), 1.0f / (1U << 30), 1.0f / (1U << 31),
}; };
#ifdef USE_JIT
using namespace Gen; using namespace Gen;
#endif
void LOADERDECL PosMtx_ReadDirect_UByte() void LOADERDECL PosMtx_ReadDirect_UByte()
{ {
@ -205,6 +206,8 @@ VertexLoader::VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr)
AllocCodeSpace(COMPILED_CODE_SIZE); AllocCodeSpace(COMPILED_CODE_SIZE);
CompileVertexTranslator(); CompileVertexTranslator();
WriteProtect(); WriteProtect();
#else
CompileVertexTranslator();
#endif #endif
} }