Merge branch 'master' into GLSL-master

the only commit on master is to fix vertexloader, so disable jit for osx

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
 
 }