Merge branch 'master' into GLSL-master

this fix debug build

Source/Core/Common/Src/ChunkFile.h

@@ -246,9 +246,9 @@ private:
 			break;
 			
 		case MODE_VERIFY:
-			_dbg_assert_msg_(COMMON, (x == *ptr),
+			_dbg_assert_msg_(COMMON, (x == **ptr),
 				"Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n",
-					x, x, &x, *ptr, *ptr, &*ptr);
+					x, x, &x, **ptr, **ptr, *ptr);
 			break;
 			
 		default:

Source/Core/Common/Src/x64FPURoundMode.cpp

@@ -84,7 +84,7 @@ namespace FPURoundMode
 			};
 			unsigned short _mode;
 			asm ("fstcw %0" : : "m" (_mode));
-			_mode = (_mode & ~table[4]) | table[mode];
+			_mode = (_mode & ~table[3]) | table[mode];
 			asm ("fldcw %0" : : "m" (_mode));
 		#endif
 		#else