diff options
| author | degasus <wickmarkus@web.de> | 2013-03-06 19:07:15 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2013-03-06 19:07:15 +0100 |
| commit | 5dd502df3b678e04ecc5a5a79af43ecf047b9f92 (patch) | |
| tree | 24c85efd5aeb3295587a30d04fff27bd4927fad2 /Source/Core/VideoCommon/Src/VertexLoader.cpp | |
| parent | 03511d54d6235eff1e24ec4958e3ea6ed095a687 (diff) | |
| parent | 7158c14d7a1e6c86bfb6602a11d79dbe989cac9d (diff) | |
Merge branch 'master' into GLSL-master
the only commit on master is to fix vertexloader, so disable jit for osx
Diffstat (limited to 'Source/Core/VideoCommon/Src/VertexLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/VertexLoader.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Src/VertexLoader.cpp b/Source/Core/VideoCommon/Src/VertexLoader.cpp index 6c85324ba8..5e4fbc6a7b 100644 --- a/Source/Core/VideoCommon/Src/VertexLoader.cpp +++ b/Source/Core/VideoCommon/Src/VertexLoader.cpp @@ -44,8 +44,10 @@ #include "XFMemory.h" extern float GC_ALIGNED16(g_fProjectionMatrix[16]); #ifndef _M_GENERIC +#ifndef __APPLE__ #define USE_JIT #endif +#endif #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 << 28), 1.0f / (1U << 29), 1.0f / (1U << 30), 1.0f / (1U << 31), }; -#ifdef USE_JIT + using namespace Gen; -#endif void LOADERDECL PosMtx_ReadDirect_UByte() { @@ -205,6 +206,8 @@ VertexLoader::VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr) AllocCodeSpace(COMPILED_CODE_SIZE); CompileVertexTranslator(); WriteProtect(); + #else + CompileVertexTranslator(); #endif } |