Minor changes for compatibility with VS2017

Common/CPUDetect.cpp

@@ -52,7 +52,7 @@ void do_cpuid(u32 regs[4], u32 cpuid_leaf) {
 #else
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 
 #define _XCR_XFEATURE_ENABLED_MASK 0
 static unsigned long long _xgetbv(unsigned int index)

Common/ColorConv.cpp

@@ -22,7 +22,7 @@
 #include "CPUDetect.h"
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #endif
 
 #if _M_SSE >= 0x401

Core/MIPS/IR/IRInterpreter.cpp

@@ -5,7 +5,7 @@
 #include "Common/Common.h"
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #endif
 
 #include "Core/Core.h"

Core/MIPS/x86/CompVFPU.cpp

@@ -20,7 +20,7 @@
 
 #include <cmath>
 #include <limits>
-#include <xmmintrin.h>
+#include <emmintrin.h>
 
 #include "base/logging.h"
 #include "math/math_util.h"

Core/MIPS/x86/RegCacheFPU.cpp

@@ -19,7 +19,7 @@
 #if PPSSPP_ARCH(X86) || PPSSPP_ARCH(AMD64)
 
 #include <cstring>
-#include <xmmintrin.h>
+#include <emmintrin.h>
 
 #include "Common/Log.h"
 #include "Common/x64Emitter.h"

Core/Util/AudioFormat.cpp

@@ -22,7 +22,7 @@
 #include "Globals.h"
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #endif
 
 void AdjustVolumeBlockStandard(s16 *out, s16 *in, size_t size, int leftVol, int rightVol) {

GPU/Common/TextureDecoder.cpp

@@ -28,7 +28,7 @@
 // TODO: Move some common things into here.
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #if _M_SSE >= 0x401
 #include <smmintrin.h>
 #endif

GPU/D3D11/FramebufferManagerD3D11.cpp

@@ -53,7 +53,7 @@
 #include <algorithm>
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #endif
 
 static const char *vscode =

GPU/Directx9/FramebufferDX9.cpp

@@ -41,7 +41,7 @@
 #include <algorithm>
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #endif
 
 namespace DX9 {

GPU/GLES/TextureCacheGLES.cpp

@@ -41,7 +41,7 @@
 #include "GPU/Common/TextureDecoder.h"
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #endif
 
 #ifndef GL_UNPACK_ROW_LENGTH

GPU/GPUCommon.h

@@ -10,7 +10,7 @@
 #if defined(__ANDROID__)
 #include <atomic>
 #elif defined(_M_SSE)
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #endif
 
 typedef ThreadEventQueue<GPUInterface, GPUEvent, GPUEventType, GPU_EVENT_INVALID, GPU_EVENT_SYNC_THREAD, GPU_EVENT_FINISH_EVENT_LOOP> GPUThreadEventQueue;

GPU/Vulkan/TextureCacheVulkan.cpp

@@ -45,7 +45,7 @@
 #include "GPU/Common/TextureDecoder.h"
 
 #ifdef _M_SSE
-#include <xmmintrin.h>
+#include <emmintrin.h>
 #endif
 
 #define TEXCACHE_NAME_CACHE_SIZE 16

UI/GameInfoCache.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2013- PPSSPP Project.
+// Copyright (c) 2013- PPSSPP Project.
 
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include <string>
 #include <map>
 #include <mutex>
+#include <atomic>
 
 #include "file/file_util.h"
 #include "Core/ELF/ParamSFO.h"
@@ -57,46 +58,6 @@ enum GameInfoWantFlags {
 class FileLoader;
 enum class IdentifiedFileType;
 
-// TODO: Need to use std::atomic<bool> instead.
-class CompletionFlag {
-public:
-	CompletionFlag() : pending(1) {
-	}
-
-	void SetDone() {
-#if defined(_WIN32)
-		_WriteBarrier();
-		pending = 0;
-#else
-		__sync_lock_release(&pending);
-#endif
-	}
-
-	bool IsDone() {
-		const bool done = pending == 0;
-#if defined(_WIN32)
-		_ReadBarrier();
-#else
-		__sync_synchronize();
-#endif
-		return done;
-	}
-
-	CompletionFlag &operator =(const bool &v) {
-		pending = v ? 0 : 1;
-		return *this;
-	}
-
-	operator bool() {
-		return IsDone();
-	}
-
-private:
-	volatile u32 pending;
-
-	DISALLOW_COPY_AND_ASSIGN(CompletionFlag);
-};
-
 class GameInfo {
 public:
 	GameInfo();
@@ -159,10 +120,10 @@ public:
 	double timePic0WasLoaded;
 	double timePic1WasLoaded;
 
-	CompletionFlag iconDataLoaded;
-	CompletionFlag pic0DataLoaded;
-	CompletionFlag pic1DataLoaded;
-	CompletionFlag sndDataLoaded;
+	std::atomic<bool> iconDataLoaded;
+	std::atomic<bool> pic0DataLoaded;
+	std::atomic<bool> pic1DataLoaded;
+	std::atomic<bool> sndDataLoaded;
 
 	u64 gameSize;
 	u64 saveDataSize;