gsdx: defer init of GSUtil global object

Close #1935
PCSX2 · May 21, 2017 · 5c7d9d0 · 5c7d9d0
1 parent e043822
commit 5c7d9d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp
@@ -128,6 +128,7 @@ EXPORT_C_(int) GSinit()
 	// const type qualifier from all the affected variables.
 	theApp.Init();
 
+	GSUtil::Init();
 	GSBlock::InitVectors();
 	GSClut::InitVectors();
 #ifdef ENABLE_OPENCL

diff --git a/plugins/GSdx/GSUtil.cpp b/plugins/GSdx/GSUtil.cpp
@@ -102,7 +102,8 @@ static class GSUtilMaps
 	uint32 CompatibleBitsField[64][2];
 	uint32 SharedBitsField[64][2];
 
-	GSUtilMaps()
+	// Defer init to avoid AVX2 illegal instructions
+	void Init()
 	{
 		PrimClassField[GS_POINTLIST] = GS_POINT_CLASS;
 		PrimClassField[GS_LINELIST] = GS_LINE_CLASS;
@@ -163,6 +164,11 @@ static class GSUtilMaps
 
 } s_maps;
 
+void GSUtil::Init()
+{
+	s_maps.Init();
+}
+
 GS_PRIM_CLASS GSUtil::GetPrimClass(uint32 prim)
 {
 	return (GS_PRIM_CLASS)s_maps.PrimClassField[prim];

diff --git a/plugins/GSdx/GSUtil.h b/plugins/GSdx/GSUtil.h
@@ -37,6 +37,8 @@ struct OCLDeviceDesc
 class GSUtil
 {
 public:
+	static void Init();
+
 	static const char* GetLibName();
 
 	static GS_PRIM_CLASS GetPrimClass(uint32 prim);