Fix

Update LLVM 5.0
Initial LLVM 5 port
2017-07-14 16:57:03 +02:00 · 2017-07-14 16:56:44 +02:00 · 2017-07-14 16:51:32 +02:00 · 2017-07-14 16:51:32 +02:00 · 2017-07-14 16:51:29 +02:00 · 2017-07-14 16:51:29 +02:00
83 changed files with 965 additions and 269 deletions
@@ -41,7 +41,6 @@
 /Vulkan/Vulkan-build
 /Vulkan/glslang-build

-/wxWidgets/lib
 /bin/rpcs3.ini
 /bin/rpcs3.ipdb
 /bin/rpcs3.iobj
@@ -56,6 +55,7 @@ rpcs3/git-version.h

 # Visual Studio Files
 .vs/*
+*.ipch
 *.vspx
 *.psess
 *.VC.*
@@ -92,4 +92,4 @@ rpcs3/rpcs3_*_cotire.cmake
 moc_*.cpp
 qrc_resources.cpp
 rpcs3_automoc.cpp
-ui_*.h
+ui_*.h
@@ -8,7 +8,6 @@
 [submodule "llvm"]
 	path = llvm
 	url = https://github.com/llvm-mirror/llvm
-	branch = release_40
 [submodule "rsx_program_decompiler"]
 	path = rsx_program_decompiler
 	url = https://github.com/RPCS3/rsx_program_decompiler
@@ -17,7 +16,7 @@
 	url = https://github.com/Microsoft/GSL.git
 [submodule "libpng"]
 	path = 3rdparty/libpng
-	url = https://github.com/RPCS3/libpng
+	url = https://github.com/Zangetsu38/libpng
 	ignore = dirty
 [submodule "Vulkan/glslang"]
 	path = Vulkan/glslang
@@ -42,5 +41,5 @@
 	url = https://github.com/madler/zlib
 [submodule "3rdparty/hidapi"]
 	path = 3rdparty/hidapi
-	url = https://github.com/RPCS3/hidapi
+	url = https://github.com/Zangetsu38/hidapi
 	branch = master
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0.2)

 option(WITH_GDB "WITH_GDB" OFF)
 option(WITHOUT_LLVM "WITHOUT_LLVM" OFF)
@@ -21,15 +21,15 @@ If you want to contribute please take a look at the [Coding Style](https://githu
 ## Dependencies

 ### Windows
-* [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx)
-* [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145)
+* [Visual Studio 2017](https://www.visualstudio.com/downloads/)
+* [Visual C++ Redistributable Packages for Visual Studio 2017](https://go.microsoft.com/fwlink/?LinkId=746572)
 * [Cmake 3.1.0+](https://www.cmake.org/download/) (required; add to PATH)
 * [Python 3.3+](https://www.python.org/downloads/) (required; add to PATH)
-* [Qt 5.7+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.7\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin)
+* [Qt 5.9+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.9\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin)
 * [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2015) (optional; see above)

 ### Linux
-* [Qt 5.7+](https://www.qt.io/download-open-source/)
+* [Qt 5.9+](https://www.qt.io/download-open-source/)
 * GCC 5.1+ or Clang 3.5.0+ ([not GCC 6.1](https://github.com/RPCS3/rpcs3/issues/1691))
 * Debian & Ubuntu: `sudo apt-get install cmake build-essential libasound2-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git qt5-default`
 * Arch: `sudo pacman -S glew openal cmake llvm qt5-base`
@@ -47,10 +47,10 @@ To initialize the repository don't forget to execute `git submodule update --ini
 ### Configuring Qt

 *If you're using Visual Studio 2017 without Qt plugin support (or simply dont want to use it):* 
-1) Add `QTDIR` environment variable and set it to `<QtInstallFolder>\5.7\msvc2015_64\` </br>
+1) Add `QTDIR` environment variable and set it to `<QtInstallFolder>\5.9\msvc2017_64\` </br>

 *If you wish to use the Visual Studio plugin for Qt:* </br>
-1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.7\msvc2015_64`. </br>
+1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.8\msvc2015_64`. </br>
 2) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added. 

 ### Building the projects
@@ -257,11 +257,11 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 		return RTDyldMemoryManager::registerEHFrames(addr, load_addr, size);
 	}

-	virtual void deregisterEHFrames(u8* addr, u64 load_addr, std::size_t size) override
+	virtual void deregisterEHFrames() override
 	{
 		LOG_ERROR(GENERAL, "deregisterEHFrames() called"); // Not expected

-		return RTDyldMemoryManager::deregisterEHFrames(addr, load_addr, size);
+		return RTDyldMemoryManager::deregisterEHFrames();
 	}
 };

@@ -19,7 +19,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -19,12 +19,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -39,20 +39,20 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m</NMakeBuildCommandLine>
-    <NMakeCleanCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m
    </NMakeReBuildCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m</NMakeCleanCommandLine>
  </PropertyGroup>
  <ItemDefinitionGroup>
@@ -19,12 +19,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -39,24 +39,24 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m</NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m
    </NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m
    </NMakeCleanCommandLine>
  </PropertyGroup>
@@ -1,6 +1,6 @@
 version: '0.0.2-{build}'

-os: Visual Studio 2015
+os: Visual Studio 2017
 platform: x64
 clone_folder: C:\rpcs3
 clone_depth: 3
@@ -15,8 +15,8 @@ before_build:
 - git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp 3rdparty/cereal 3rdparty/zlib 3rdparty/hidapi
 - 7z x zlib.7z -aos -oC:\rpcs3\ > null
 - 7z x vulkan.7z -aos -oC:\rpcs3\Vulkan > null
- - if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
-   else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 14 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/lib/cmake/llvm -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
+ - if %configuration%==Release (cmake -G "Visual Studio 15 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
+   else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 15 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/lib/cmake/llvm -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)

 build_script:
 - cmake --build . --config Release -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@@ -25,9 +25,9 @@ install:
 - if not exist llvmlibs.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRY2k3Q2Yya05lcm8" -FileName llvmlibs.7z
 - if not exist vulkan.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRaHYxV3VOS2d0a0U" -FileName vulkan.7z
 - if not exist zlib.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B-HVE3xvheVFX05lRFdnZlh5aUU" -FileName zlib.7z
- - set QTDIR=C:\Qt\5.8\msvc2015_64
+ - set QTDIR=C:\Qt\5.9\msvc2017_64
 - set OPENALDIR=C:\rpcs3\3rdparty\OpenAL
- - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%QTDIR%;%PATH%
+ - set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%QTDIR%;%PATH%
 - set COMMIT_SHA=%APPVEYOR_REPO_COMMIT:~0,8%

 artifacts:
@@ -93,7 +93,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -18,12 +18,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -39,30 +39,30 @@
    <NMakePreprocessorDefinitions>
    </NMakePreprocessorDefinitions>
    <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m
    </NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <NMakePreprocessorDefinitions />
    <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m
    </NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m
    </NMakeCleanCommandLine>
  </PropertyGroup>
@@ -20,14 +20,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
 EndProject
@@ -5,7 +5,7 @@ set(RES_FILES "")
 set(CMAKE_CXX_STANDARD 14)

 # Qt section
-find_package(Qt5 5.7 COMPONENTS Widgets)
+find_package(Qt5 5.9 COMPONENTS Widgets)
 if (WIN32)
    find_package(Qt5WinExtras REQUIRED)
    set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras)
@@ -17,8 +17,8 @@ endif()

 # Let's make sure we have Qt before we continue
 if (NOT Qt5Widgets_FOUND)
-	if (Qt5Widgets_VERSION VERSION_LESS 5.7.0)
-		message("Minimum supported Qt5 version is 5.7! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
+	if (Qt5Widgets_VERSION VERSION_LESS 5.9.0)
+		message("Minimum supported Qt5 version is 5.9! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
 		if ("${CMAKE_SYSTEM}" MATCHES "Linux")
 			message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt.
 If you're on Ubuntu or Linux Mint, there are PPAs you can use to install an up-to-date qt5 version.
@@ -37,7 +37,7 @@ before re-running cmake")
    
    message("CMake was unable to find Qt5!")
    if (WIN32)
-		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.8\\msvc2017_64\\)")
+		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.9\\msvc2017_64\\)")
 	elseif("${CMAKE_SYSTEM}" MATCHES "Linux")
 		message(FATAL_ERROR "Make sure to install your distro's qt5 package!")
 	else()
@@ -268,9 +268,6 @@ if(NOT WIN32 AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux")
 	set (EXCLUDE_FILES "/RSX/VK/")
 endif()

-# The Gui folder contains wxWidgets stuff, which we no longer want.
-set (EXCLUDE_FILES ${EXCLUDE_FILES} "/Gui/")
-
 # Ignore autogenerated moc_* files if present
 set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_")
 set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")
@@ -31,7 +31,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -317,6 +317,24 @@ s32 cellHttpClientSetConnectionWaitStatus()
 	return CELL_OK;
 }

+s32 cellHttpClientGetConnectionWaitStatus()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientSetConnectionWaitTimeout()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetConnectionWaitTimeout()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
 s32 cellHttpClientSetRecvTimeout()
 {
 	UNIMPLEMENTED_FUNC(cellHttp);
@@ -641,6 +659,18 @@ s32 cellHttpTransactionGetSslId()
 	return CELL_OK;
 }

+s32 cellHttpClientSetMinSslVersion()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
+s32 cellHttpClientGetMinSslVersion()
+{
+	UNIMPLEMENTED_FUNC(cellHttp);
+	return CELL_OK;
+}
+
 s32 cellHttpClientSetSslVersion()
 {
 	UNIMPLEMENTED_FUNC(cellHttp);
@@ -719,7 +749,10 @@ DECLARE(ppu_module_manager::cellHttp)("cellHttp", []()
 	REG_FUNC(cellHttp, cellHttpClientPollConnections);

 	REG_FUNC(cellHttp, cellHttpClientSetConnectionStateCallback);
+	REG_FUNC(cellHttp, cellHttpClientGetConnectionWaitStatus);
 	REG_FUNC(cellHttp, cellHttpClientSetConnectionWaitStatus);
+	REG_FUNC(cellHttp, cellHttpClientGetConnectionWaitTimeout);
+	REG_FUNC(cellHttp, cellHttpClientSetConnectionWaitTimeout);
 	REG_FUNC(cellHttp, cellHttpClientSetRecvTimeout);
 	REG_FUNC(cellHttp, cellHttpClientGetRecvTimeout);
 	REG_FUNC(cellHttp, cellHttpClientSetSendTimeout);
@@ -781,6 +814,8 @@ DECLARE(ppu_module_manager::cellHttp)("cellHttp", []()
 	REG_FUNC(cellHttp, cellHttpTransactionGetSslVersion);
 	REG_FUNC(cellHttp, cellHttpTransactionGetSslId);

+	REG_FUNC(cellHttp, cellHttpClientSetMinSslVersion);
+	REG_FUNC(cellHttp, cellHttpClientGetMinSslVersion);
 	REG_FUNC(cellHttp, cellHttpClientSetSslVersion);
 	REG_FUNC(cellHttp, cellHttpClientGetSslVersion);
 	REG_FUNC(cellHttp, cellHttpClientSetSslIdDestroyCallback);
@@ -880,7 +880,7 @@ s32 _spurs::stop_event_helper(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 		return CELL_SPURS_CORE_ERROR_STAT;
 	}

-	if (sys_event_port_send(ppu, spurs->eventPort, 0, 1, 0) != CELL_OK)
+	if (sys_event_port_send(spurs->eventPort, 0, 1, 0) != CELL_OK)
 	{
 		return CELL_SPURS_CORE_ERROR_STAT;
 	}
@@ -2794,7 +2794,7 @@ s32 cellSpursEventFlagSet(ppu_thread& ppu, vm::ptr<CellSpursEventFlag> eventFlag
 		// Signal the PPU thread to be woken up
 		eventFlag->pendingRecvTaskEvents[ppuWaitSlot] = ppuEvents;

-		CHECK_SUCCESS(sys_event_port_send(ppu, eventFlag->eventPortId, 0, 0, 0));
+		CHECK_SUCCESS(sys_event_port_send(eventFlag->eventPortId, 0, 0, 0));
 	}

 	if (pendingRecv)
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"

@@ -911,6 +911,10 @@ s32 sceNpManagerRegisterCallback(vm::ptr<SceNpManagerCallback> callback, vm::ptr
 	{
 		return SCE_NP_ERROR_INVALID_ARGUMENT;
 	}
+	else
+	{
+		return SCE_NP_ERROR_NOT_INITIALIZED;
+	}

 	return CELL_OK;
 }
@@ -1717,6 +1721,18 @@ s32 sceNpSignalingGetPeerNetInfoResult()
 	return CELL_OK;
 }

+s32 sceNpUtilCanonicalizeNpIdForPs3()
+{
+	UNIMPLEMENTED_FUNC(sceNp);
+	return CELL_OK;
+}
+
+s32 sceNpUtilCanonicalizeNpIdForPsp()
+{
+	UNIMPLEMENTED_FUNC(sceNp);
+	return CELL_OK;
+}
+
 s32 sceNpUtilCmpNpId(vm::ptr<SceNpId> id1, vm::ptr<SceNpId> id2)
 {
 	sceNp.warning("sceNpUtilCmpNpId(id1=*0x%x, id2=*0x%x)", id1, id2);
@@ -2032,11 +2048,13 @@ DECLARE(ppu_module_manager::sceNp)("sceNp", []()
 	REG_FUNC(sceNp, sceNpSignalingGetPeerNetInfo);
 	REG_FUNC(sceNp, sceNpSignalingCancelPeerNetInfo);
 	REG_FUNC(sceNp, sceNpSignalingGetPeerNetInfoResult);
+	REG_FUNC(sceNp, sceNpUtilCanonicalizeNpIdForPs3);
+	REG_FUNC(sceNp, sceNpUtilCanonicalizeNpIdForPsp);
 	REG_FUNC(sceNp, sceNpUtilCmpNpId);
 	REG_FUNC(sceNp, sceNpUtilCmpNpIdInOrder);
-	REG_FUNC(sceNp, sceNpUtilCmpOnlineId); // 0x8C760B52
-	REG_FUNC(sceNp, sceNpUtilGetPlatformType); // 0xC611029A
-	REG_FUNC(sceNp, sceNpUtilSetPlatformType); // 0xAFC62605
+	REG_FUNC(sceNp, sceNpUtilCmpOnlineId);
+	REG_FUNC(sceNp, sceNpUtilGetPlatformType);
+	REG_FUNC(sceNp, sceNpUtilSetPlatformType);
 	REG_FUNC(sceNp, _sceNpSysutilClientMalloc);
 	REG_FUNC(sceNp, _sceNpSysutilClientFree);
 	REG_FUNC(sceNp, _Z33_sce_np_sysutil_send_empty_packetiPN16sysutil_cxmlutil11FixedMemoryEPKcS3_);
@@ -445,6 +445,29 @@ s32 sceNpMatching2RegisterRoomMessageCallback()
 	return CELL_OK;
 }

+s32 sceNpMatching2SignalingCancelPeerNetInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNp2);
+	return CELL_OK;
+}
+
+s32 sceNpMatching2SignalingGetLocalNetInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNp2);
+	return CELL_OK;
+}
+
+s32 sceNpMatching2SignalingGetPeerNetInfo()
+{
+	UNIMPLEMENTED_FUNC(sceNp2);
+	return CELL_OK;
+}
+
+s32 sceNpMatching2SignalingGetPeerNetInfoResult()
+{
+	UNIMPLEMENTED_FUNC(sceNp2);
+	return CELL_OK;
+}

 DECLARE(ppu_module_manager::sceNp2)("sceNp2", []()
 {
@@ -517,4 +540,8 @@ DECLARE(ppu_module_manager::sceNp2)("sceNp2", []()
 	REG_FUNC(sceNp2, sceNpMatching2Init2);
 	REG_FUNC(sceNp2, sceNpMatching2SetLobbyMemberDataInternal);
 	REG_FUNC(sceNp2, sceNpMatching2RegisterRoomMessageCallback);
+	REG_FUNC(sceNp2, sceNpMatching2SignalingCancelPeerNetInfo);
+	REG_FUNC(sceNp2, sceNpMatching2SignalingGetLocalNetInfo);
+	REG_FUNC(sceNp2, sceNpMatching2SignalingGetPeerNetInfo);
+	REG_FUNC(sceNp2, sceNpMatching2SignalingGetPeerNetInfoResult);
 });
@@ -130,6 +130,11 @@ struct ppu_linkage_info
 // Initialize static modules.
 static void ppu_initialize_modules(const std::shared_ptr<ppu_linkage_info>& link)
 {
+	if (!link->modules.empty())
+	{
+		return;
+	}
+
 	ppu_initialize_syscalls();

 	const std::initializer_list<const ppu_static_module*> registered
@@ -674,6 +679,9 @@ std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, const std::stri
 	// Access linkage information object
 	const auto link = fxm::get_always<ppu_linkage_info>();

+	// Initialize HLE modules
+	ppu_initialize_modules(link);
+
 	for (const auto& prog : elf.progs)
 	{
 		LOG_NOTICE(LOADER, "** Segment: p_type=0x%x, p_vaddr=0x%llx, p_filesz=0x%llx, p_memsz=0x%llx, flags=0x%x", prog.p_type, prog.p_vaddr, prog.p_filesz, prog.p_memsz, prog.p_flags);
@@ -894,6 +902,15 @@ std::shared_ptr<lv2_prx> ppu_load_prx(const ppu_prx_object& elf, const std::stri
 	prx->epilogue.set(prx->specials[0x330F7005]);
 	prx->name = path.substr(path.find_last_of('/') + 1);
 	prx->path = path;
+
+	if (Emu.IsReady() && fxm::import<ppu_module>([&] { return prx; }))
+	{
+		// Special loading mode
+		auto ppu = idm::make_ptr<ppu_thread>("test_thread", 0, 0x100000);
+
+		ppu->cmd_push({ppu_cmd::initialize, 0});
+	}
+
 	return prx;
 }

@@ -1151,6 +1168,7 @@ void ppu_load_exec(const ppu_exec_object& elf)
 			{ "cellFont", "libfont.sprx" },
 			{ "cellFontFT", "libfontFT.sprx" },
 			{ "cellFontFT", "libfreetype.sprx" },
+            { "cellGcmSys", "libgcm_sys.sprx"},
 			{ "cellGifDec", "libgifdec.sprx" },
 			{ "cellGifDec", "libsre.sprx" },
 			{ "cellJpgDec", "libjpgdec.sprx" },
@@ -16,7 +16,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* module, const ppu_mod
 	, m_module(module)
 	, m_is_be(false)
 	, m_info(info)
-	, m_pure_attr(AttributeSet::get(m_context, AttributeSet::FunctionIndex, {Attribute::NoUnwind, Attribute::ReadNone}))
+	, m_pure_attr(AttributeList::get(m_context,AttributeList::FunctionIndex, AttrBuilder().addAttribute(Attribute::NoUnwind).addAttribute(Attribute::ReadNone)))
 {
 	// There is no weak linkage on JIT, so let's create variables with different names for each module part
 	const u32 gsuffix = m_info.name.empty() ? info.funcs[0].addr : info.funcs[0].addr - m_info.segs[0].addr;
@@ -133,7 +133,7 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 	const u64 base = m_reloc ? m_reloc->addr : 0;
 	m_addr = info.addr - base;

-	m_thread = &*m_function->getArgumentList().begin();
+	m_thread = &*m_function->arg_begin();
 	m_base_loaded = m_ir->CreateLoad(m_base);

 	m_body = BasicBlock::Create(m_context, "__body", m_function);
@@ -120,7 +120,7 @@ class PPUTranslator final //: public CPUTranslator
 	std::map<u64, const ppu_reloc*> m_relocs;

 	// Attributes for function calls which are "pure" and may be optimized away if their results are unused
-	const llvm::AttributeSet m_pure_attr;
+	const llvm::AttributeList m_pure_attr;

 	// IR builder
 	llvm::IRBuilder<>* m_ir;
@@ -404,7 +404,7 @@ public:

 	// Call a function with attribute list
 	template<typename... Args>
-	llvm::CallInst* Call(llvm::Type* ret, llvm::AttributeSet attr, llvm::StringRef name, Args... args)
+	llvm::CallInst* Call(llvm::Type* ret, llvm::AttributeList attr, llvm::StringRef name, Args... args)
 	{
 		// Call the function
 		return m_ir->CreateCall(m_module->getOrInsertFunction(name, llvm::FunctionType::get(ret, {args->getType()...}, false), attr), {args...});
@@ -414,7 +414,7 @@ public:
 	template<typename... Args>
 	llvm::CallInst* Call(llvm::Type* ret, llvm::StringRef name, Args... args)
 	{
-		return Call(ret, llvm::AttributeSet{}, name, args...);
+		return Call(ret, llvm::AttributeList{}, name, args...);
 	}

 	// Handle compilation errors
@@ -414,7 +414,7 @@ error_code sys_event_port_disconnect(u32 eport_id)
 	return CELL_OK;
 }

-error_code sys_event_port_send(ppu_thread& ppu, u32 eport_id, u64 data1, u64 data2, u64 data3)
+error_code sys_event_port_send(u32 eport_id, u64 data1, u64 data2, u64 data3)
 {
 	sys_event.trace("sys_event_port_send(eport_id=0x%x, data1=0x%llx, data2=0x%llx, data3=0x%llx)", eport_id, data1, data2, data3);

@@ -137,4 +137,4 @@ error_code sys_event_port_create(vm::ps3::ptr<u32> eport_id, s32 port_type, u64
 error_code sys_event_port_destroy(u32 eport_id);
 error_code sys_event_port_connect_local(u32 event_port_id, u32 event_queue_id);
 error_code sys_event_port_disconnect(u32 eport_id);
-error_code sys_event_port_send(ppu_thread& ppu, u32 event_port_id, u64 data1, u64 data2, u64 data3);
+error_code sys_event_port_send(u32 event_port_id, u64 data1, u64 data2, u64 data3);
@@ -25,16 +25,13 @@ static const std::unordered_map<std::string, int> s_prx_ignore
 	{ "/dev_flash/sys/external/libaudio.sprx", 0 },
 	{ "/dev_flash/sys/external/libbeisobmf.sprx", 0 },
 	{ "/dev_flash/sys/external/libcamera.sprx", 0 },
-	{ "/dev_flash/sys/external/libgcm_sys.sprx", 0 },
 	{ "/dev_flash/sys/external/libgem.sprx", 0 },
-	{ "/dev_flash/sys/external/libhttp.sprx", 0 },
 	{ "/dev_flash/sys/external/libio.sprx", 0 },
 	{ "/dev_flash/sys/external/libmedi.sprx", 0 },
 	{ "/dev_flash/sys/external/libmic.sprx", 0 },
 	{ "/dev_flash/sys/external/libnet.sprx", 0 },
 	{ "/dev_flash/sys/external/libnetctl.sprx", 0 },
 	{ "/dev_flash/sys/external/librudp.sprx", 0 },
-	{ "/dev_flash/sys/external/libssl.sprx", 0 },
 	{ "/dev_flash/sys/external/libsysutil.sprx", 0 },
 	{ "/dev_flash/sys/external/libsysutil_ap.sprx", 0 },
 	{ "/dev_flash/sys/external/libsysutil_authdialog.sprx", 0 },
@@ -1,14 +1,109 @@
 #include "stdafx.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-
+#include "Emu/Cell/PPUModule.h"
+#include "Emu/RSX/GSRender.h"
+#include "Emu/IdManager.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "sys_rsx.h"
+#include "sys_event.h"

 namespace vm { using namespace ps3; }

 logs::channel sys_rsx("sys_rsx");

+extern u64 get_timebased_time();
+
+struct RsxDriverInfo {
+    be_t<u32> version_driver;     // 0x0
+    be_t<u32> version_gpu;        // 0x4
+    be_t<u32> memory_size;        // 0x8
+    be_t<u32> hardware_channel;   // 0xC
+    be_t<u32> nvcore_frequency;   // 0x10
+    be_t<u32> memory_frequency;   // 0x14
+    be_t<u32> unk1[4];            // 0x18 - 0x24
+    be_t<u32> unk2;               // 0x28 -- pgraph stuff
+    be_t<u32> reportsNotifyOffset;// 0x2C offset to notify memory
+    be_t<u32> reportsOffset;      // 0x30 offset to reports memory
+    be_t<u32> reportsReportOffset;// 0x34 offset to reports in reports memory
+    be_t<u32> unk3[6];            // 0x38-0x54
+    be_t<u32> systemModeFlags;    // 0x54
+    u8 unk4[0x1064];              // 0x10B8
+    struct Head {
+        be_t<u64> lastFlipTime;    // 0x0 last flip time
+        be_t<u32> flipFlags;       // 0x8 flags to handle flip/queue
+        be_t<u32> unk1;            // 0xC
+        be_t<u32> flipBufferId;    // 0x10
+        be_t<u32> queuedBufferId;  // 0x14 todo: this is definately not this variable but its 'unused' so im using it for queueId to pass to flip handler
+        be_t<u32> unk3;            // 0x18
+        be_t<u32> unk6;            // 0x18 possible low bits of time stamp?  used in getlastVBlankTime
+        be_t<u64> lastSecondVTime; // 0x20 last time for second vhandler freq
+        be_t<u64> unk4;            // 0x28 
+        be_t<u64> vBlankCount;     // 0x30
+        be_t<u32> unk;             // 0x38 possible u32, 'flip field', top/bottom for interlaced
+        be_t<u32> unk5;            // 0x3C possible high bits of time stamp? used in getlastVBlankTime
+    } head[8]; // size = 0x40, 0x200
+    be_t<u32> unk7;          // 0x12B8
+    be_t<u32> unk8;          // 0x12BC
+    be_t<u32> handlers;      // 0x12C0 -- flags showing which handlers are set
+    be_t<u32> unk9;          // 0x12C4
+    be_t<u32> unk10;         // 0x12C8
+    be_t<u32> userCmdParam;  // 0x12CC
+    be_t<u32> handler_queue; // 0x12D0
+    be_t<u32> unk11;         // 0x12D4
+    be_t<u32> unk12;         // 0x12D8
+    be_t<u32> unk13;         // 0x12DC
+    be_t<u32> unk14;         // 0x12E0
+    be_t<u32> unk15;         // 0x12E4
+    be_t<u32> unk16;         // 0x12E8
+    be_t<u32> unk17;         // 0x12F0
+    be_t<u32> lastError;     // 0x12F4 error param for cellGcmSetGraphicsHandler
+    // todo: theres more to this 
+};
+template <size_t S> class Sizer { };
+Sizer<sizeof(RsxDriverInfo)> foo;
+static_assert(sizeof(RsxDriverInfo) == 0x12F8, "rsxSizeTest");
+static_assert(sizeof(RsxDriverInfo::Head) == 0x40, "rsxHeadSizeTest");
+
+struct RsxDmaControl {
+    u8 resv[0x40];
+    be_t<u32> put;
+    be_t<u32> get;
+    be_t<u32> ref;
+    be_t<u32> unk[2];
+    be_t<u32> unk1;
+};
+
+struct RsxSemaphore {
+    be_t<u32> val;
+    be_t<u32> pad;
+    be_t<u64> timestamp;
+};
+
+struct RsxNotify {
+    be_t<u64> timestamp;
+    be_t<u64> zero;
+};
+
+struct RsxReport {
+    be_t<u64> timestamp;
+    be_t<u32> val;
+    be_t<u32> pad;
+};
+
+struct RsxReports {
+    RsxSemaphore semaphore[0x100];
+    RsxNotify notify[64];
+    RsxReport report[2048];
+};
+
+be_t<u32> g_rsx_event_port{ 0 };
+u32 g_driverInfo{ 0 };
+
+u64 rsxTimeStamp() {
+    return get_timebased_time();
+}
+
 s32 sys_rsx_device_open()
 {
 	sys_rsx.todo("sys_rsx_device_open()");
@@ -37,6 +132,9 @@ s32 sys_rsx_memory_allocate(vm::ptr<u32> mem_handle, vm::ptr<u64> mem_addr, u32
 {
 	sys_rsx.todo("sys_rsx_memory_allocate(mem_handle=*0x%x, mem_addr=*0x%x, size=0x%x, flags=0x%llx, a5=0x%llx, a6=0x%llx, a7=0x%llx)", mem_handle, mem_addr, size, flags, a5, a6, a7);

+    *mem_handle = 1;
+    *mem_addr = vm::falloc(0xC0000000, size, vm::video);
+
 	return CELL_OK;
 }

@@ -60,10 +158,89 @@ s32 sys_rsx_memory_free(u32 mem_handle)
 * @param mem_ctx (IN): mem_ctx given by sys_rsx_memory_allocate
 * @param system_mode (IN):
 */
-s32 sys_rsx_context_allocate(vm::ptr<u32> context_id, vm::ptr<u32> lpar_dma_control, vm::ptr<u32> lpar_driver_info, vm::ptr<u32> lpar_reports, u64 mem_ctx, u64 system_mode)
+s32 sys_rsx_context_allocate(vm::ptr<u32> context_id, vm::ptr<u64> lpar_dma_control, vm::ptr<u64> lpar_driver_info, vm::ptr<u64> lpar_reports, u64 mem_ctx, u64 system_mode)
 {
-	sys_rsx.todo("sys_rsx_context_allocate(context_id=*0x%x, lpar_dma_control=*0x%x, lpar_driver_info=*0x%x, lpar_reports=*0x%x, mem_ctx=0x%llx, system_mode=0x%llx)",
-		context_id, lpar_dma_control, lpar_driver_info, lpar_reports, mem_ctx, system_mode);
+    sys_rsx.todo("sys_rsx_context_allocate(context_id=*0x%x, lpar_dma_control=*0x%x, lpar_driver_info=*0x%x, lpar_reports=*0x%x, mem_ctx=0x%llx, system_mode=0x%llx)",
+        context_id, lpar_dma_control, lpar_driver_info, lpar_reports, mem_ctx, system_mode);
+
+    vm::falloc(0x40000000, 0x10000000, vm::rsx_context);
+
+    *context_id = 0x55555555;
+
+    *lpar_dma_control = 0x40100000;
+    *lpar_driver_info = 0x40200000;
+    *lpar_reports = 0x40300000;
+
+    auto &reports = vm::_ref<RsxReports>(*lpar_reports);
+    std::memset(&reports, 0, sizeof(RsxReports));
+
+    for (int i = 0; i < 64; ++i)
+        reports.notify[i].timestamp = (u64)-1;
+
+    for (int i = 0; i < 256; ++i) {
+        reports.semaphore[i].val = 0x1337C0D3;
+        reports.semaphore[i].pad = 0x1337BABE;
+        reports.semaphore[i].timestamp = (u64)-1; // technically different but should be fine
+    }
+
+    for (int i = 0; i < 2048; ++i)
+        reports.report[i].timestamp = (u64)-1;
+
+    auto &sysReports = vm::_ref<RsxSemaphore>(0x40000030);
+    // slight hack for testing....
+    sysReports.val = 1;
+
+    auto &driverInfo = vm::_ref<RsxDriverInfo>(*lpar_driver_info);
+
+    std::memset(&driverInfo, 0, sizeof(RsxDriverInfo));
+
+    driverInfo.version_driver = 0x211;
+    driverInfo.version_gpu = 0x5c;
+    driverInfo.memory_size = 0xFE00000;
+    driverInfo.nvcore_frequency = 500000000; // 0x1DCD6500
+    driverInfo.memory_frequency = 650000000; // 0x26BE3680
+    driverInfo.reportsNotifyOffset = 0x1000;
+    driverInfo.reportsOffset = 0;
+    driverInfo.reportsReportOffset = 0x1400;
+    driverInfo.systemModeFlags = system_mode;
+    driverInfo.hardware_channel = 1; // * i think* this 1 for games, 0 for vsh
+
+    g_driverInfo = *lpar_driver_info;
+
+    auto &dmaControl = vm::_ref<RsxDmaControl>(*lpar_dma_control);
+    dmaControl.get = 0;
+    dmaControl.put = 0;
+    dmaControl.ref = 0xFFFFFFFF;
+
+    if (false/*system_mode == CELL_GCM_SYSTEM_MODE_IOMAP_512MB*/)
+        RSXIOMem.SetRange(0, 0x20000000 /*512MB*/);
+    else
+        RSXIOMem.SetRange(0, 0x10000000 /*256MB*/);
+
+    sys_event_queue_attribute_t attr;
+    attr.protocol = SYS_SYNC_PRIORITY;
+    attr.type = SYS_PPU_QUEUE;
+    auto queueId = vm::make_var<u32>(0);
+    sys_event_queue_create(queueId, vm::make_var(attr), 0, 0x20);
+    driverInfo.handler_queue = queueId->value();
+
+    sys_event_port_create(queueId, SYS_EVENT_PORT_LOCAL, 0);
+    sys_event_port_connect_local(queueId->value(), driverInfo.handler_queue);
+
+    g_rsx_event_port = queueId->value();
+
+    const auto render = fxm::get<GSRender>();
+    render->ctrl = vm::_ptr<CellGcmControl>(*lpar_dma_control);
+    //render->intr_thread = idm::make_ptr<ppu_thread>("_gcm_intr_thread", 1, 0x4000);
+    //render->intr_thread->run();
+    //render->ctxt_addr = 0;
+    render->gcm_buffers.set((vm::alloc(sizeof(CellGcmDisplayInfo) * 8, vm::main)));
+    render->zculls_addr = vm::alloc(sizeof(CellGcmZcullInfo) * 8, vm::main);
+    render->gcm_buffers_count = 0;
+    render->gcm_current_buffer = 0;
+    render->main_mem_addr = 0;
+    render->label_addr = *lpar_reports;
+    render->init(0x30100000, 0x200000, *lpar_dma_control, 0xC0000000);

 	return CELL_OK;
 }
@@ -90,8 +267,10 @@ s32 sys_rsx_context_free(u32 context_id)
 s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags)
 {
 	sys_rsx.todo("sys_rsx_context_iomap(context_id=0x%x, io=0x%x, ea=0x%x, size=0x%x, flags=0x%llx)", context_id, io, ea, size, flags);
-
-	return CELL_OK;
+    if (RSXIOMem.Map(ea, size, io))
+	    return CELL_OK;
+    LOG_ERROR(RSX, "rsx_iomap failed");
+    return CELL_EINVAL;
 }

 /*
@@ -101,11 +280,13 @@ s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags)
 * @param io_addr (IN): IO address. E.g. 0x00600000 (Start page 6)
 * @param size (IN): Size to unmap in byte. E.g. 0x00200000
 */
-s32 sys_rsx_context_iounmap(u32 context_id, u32 a2, u32 io_addr, u32 size)
+s32 sys_rsx_context_iounmap(u32 context_id, u32 io_addr, u32 a3, u32 size)
 {
-	sys_rsx.todo("sys_rsx_context_iounmap(context_id=0x%x, a2=0x%x, io_addr=0x%x, size=0x%x)", context_id, a2, io_addr, size);
-
-	return CELL_OK;
+	sys_rsx.todo("sys_rsx_context_iounmap(context_id=0x%x, io_addr=0x%x, a3=0x%x, size=0x%x)", context_id, io_addr, a3, size);
+    if (RSXIOMem.UnmapAddress(io_addr, size))
+	    return CELL_OK;
+    LOG_ERROR(RSX, "rsx_iounmap failed");
+    return CELL_EINVAL;
 }

 /*
@@ -119,40 +300,110 @@ s32 sys_rsx_context_iounmap(u32 context_id, u32 a2, u32 io_addr, u32 size)
 */
 s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6)
 {
+    if (package_id != 0xFED)
 	sys_rsx.todo("sys_rsx_context_attribute(context_id=0x%x, package_id=0x%x, a3=0x%llx, a4=0x%llx, a5=0x%llx, a6=0x%llx)", context_id, package_id, a3, a4, a5, a6);

+    // hle/lle protection
+    if (g_driverInfo == 0)
+        return CELL_OK;
+    // todo: these event ports probly 'shouldnt' be here as i think its supposed to be interrupts that are sent from rsx somewhere in lv1
+
+    const auto render = fxm::get<GSRender>();
+    auto &driverInfo = vm::_ref<RsxDriverInfo>(g_driverInfo);
 	switch(package_id)
 	{
 	case 0x001: // FIFO
+        render->ctrl->get = a3;
+        render->ctrl->put = a4;
 		break;
 	
 	case 0x100: // Display mode set
-		break;
-
-	case 0x101: // Display sync
-		break;
+        break;
+    case 0x101: // Display sync set, cellGcmSetFlipMode
+        break;

 	case 0x102: // Display flip
+        driverInfo.head[a3].flipFlags |= 0x80000000;
+        driverInfo.head[a3].lastFlipTime = rsxTimeStamp(); // should rsxthread set this?
+        // lets give this a shot for giving bufferid back to gcm
+        driverInfo.head[a3].flipBufferId = driverInfo.head[a3].queuedBufferId;
+        // seems gcmSysWaitLabel uses this offset, so lets set it to 0 every flip
+        vm::_ref<u32>(0x40300010) = 0;
+        if (a3 == 0)
+            sys_event_port_send(g_rsx_event_port, 0, (1 << 3), 0);
+        if (a3 == 1)
+            sys_event_port_send(g_rsx_event_port, 0, (1 << 4), 0);
 		break;

-	case 0x103: // ?
+	case 0x103: // Display Queue
+        driverInfo.head[a3].queuedBufferId = a4;
+        driverInfo.head[a3].flipFlags |= 0x40000000 | (1 << a4);
+        if (a3 == 0)
+            sys_event_port_send(g_rsx_event_port, 0, (1 << 5), 0);
+        if (a3 == 1)
+            sys_event_port_send(g_rsx_event_port, 0, (1 << 6), 0);
 		break;
-
 	case 0x104: // Display buffer
-		break;
+    {
+        u8 id = a3 & 0xFF;
+        u32 width = (a4 >> 32) & 0xFFFFFFFF;
+        u32 height = a4 & 0xFFFFFFFF;
+        u32 pitch = (a5 >> 32) & 0xFFFFFFFF;
+        u32 offset = a5 & 0xFFFFFFFF;
+        if (id > 7)
+            return -17;
+        render->gcm_buffers[id].width = width;
+        render->gcm_buffers[id].height = height;
+        render->gcm_buffers[id].pitch = pitch;
+        render->gcm_buffers[id].offset = offset;
+
+        if (id + 1 > render->gcm_buffers_count)
+            render->gcm_buffers_count = id + 1;
+    }
+	break;
+    case 0x105: // destroy buffer?
+        break;

 	case 0x106: // ? (Used by cellGcmInitPerfMon)
 		break;
+    case 0x108: // ? set interrupt freq?
+        break;
+	case 0x10a: // ? Involved in managing flip status through cellGcmResetFlipStatus
+    {
+        if (a3 > 7)
+            return -17;
+        u32 flipStatus = driverInfo.head[a3].flipFlags;
+        flipStatus = (flipStatus & a4) | a5;
+        driverInfo.head[a3].flipFlags = flipStatus;
+    }
+	break;

-	case 0x10a: // ?
-		break;
+    case 0x10D: // Called by cellGcmInitCursor
+        break;

 	case 0x300: // Tiles
-		break;
+    {
+        //a4 high bits = ret.tile = (location + 1) | (bank << 4) | ((offset / 0x10000) << 16) | (location << 31);
+        //a4 low bits = ret.limit = ((offset + size - 1) / 0x10000) << 16 | (location << 31);
+        //a5 high bits = ret.pitch = (pitch / 0x100) << 8;
+        //a5 low bits = ret.format = base | ((base + ((size - 1) / 0x10000)) << 13) | (comp << 26) | (1 << 30);
+
+        auto& tile = render->tiles[a3];
+        tile.location = ((a4 >> 32) & 0xF) - 1;
+        tile.offset = ((((a4 >> 32) & 0xFFFFFFFF) >> 16) * 0x10000);
+        tile.size = ((((a4 & 0x7FFFFFFF) >> 16) + 1) * 0x10000) - tile.offset;
+        tile.pitch = (((a5 >> 32) & 0xFFFFFFFF) >> 8) * 0x100;
+        tile.comp = ((a5 & 0xFFFFFFFF) >> 26) & 0xF;
+        tile.base = (a5 & 0xFFFFFFFF) & 0x7FF;
+        tile.bank = (((a4 >> 32) & 0xFFFFFFFF) >> 4) & 0xF;
+        tile.binded = a5 != 0;
+    }
+	break;

 	case 0x301: // Depth-buffer (Z-cull)
 		break;
-
+    case 0x302: // something with zcull
+        break;
 	case 0x600: // Framebuffer setup
 		break;

@@ -162,6 +413,24 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6
 	case 0x602: // Framebuffer blit sync
 		break;

+    case 0x603: // Framebuffer close
+        break;
+
+    case 0xFED: // hack: vblank command
+        // todo: this is wrong and should be 'second' vblank handler and freq
+        // although gcmSys seems just hardcoded at 1, so w/e
+        driverInfo.head[a3].vBlankCount++;
+        driverInfo.head[a3].lastSecondVTime = rsxTimeStamp();
+        sys_event_port_send(g_rsx_event_port, 0, (1 << 1), 0);
+        sys_event_port_send(g_rsx_event_port, 0, (1 << 11), 0); // second vhandler
+        break;
+    case 0xFEF: // hack: user command
+        // 'custom' invalid package id for now 
+        // as i think we need custom lv1 interrupts to handle this accurately
+        // this also should probly be set by rsxthread
+        driverInfo.userCmdParam = a4;
+        sys_event_port_send(g_rsx_event_port, 0, (1 << 7), 0);
+        break;
 	default:
 		return CELL_EINVAL;
 	}
@@ -175,19 +444,19 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6
 * @param a2 (OUT): Unused?
 * @param dev_id (IN): An immediate value and always 8. (cellGcmInitPerfMon uses 11, 10, 9, 7, 12 successively).
 */
-s32 sys_rsx_device_map(vm::ptr<u32> addr, vm::ptr<u32> a2, u32 dev_id)
+s32 sys_rsx_device_map(vm::ptr<u64> addr, vm::ptr<u64> a2, u32 dev_id)
 {
 	sys_rsx.todo("sys_rsx_device_map(addr=*0x%x, a2=*0x%x, dev_id=0x%x)", addr, a2, dev_id);

-	if (dev_id > 15) {
-		// TODO: Throw RSX error
-		return CELL_EINVAL;
+    if (dev_id != 8) {
+		// TODO: lv1 related 
+        fmt::throw_exception("sys_rsx_device_map: Invalid dev_id %d", dev_id);
 	}

-	if (dev_id == 0 || dev_id > 8) {
-		// TODO: lv1 related so we may ignore it.
-		// if (something) { return CELL_EPERM; }
-	}
+    // a2 seems to not be referenced in cellGcmSys
+    *a2 = 0;
+
+    *addr = 0x40000000;

 	return CELL_OK;
 }
@@ -203,9 +472,12 @@ s32 sys_rsx_device_unmap(u32 dev_id)
 	return CELL_OK;
 }

-s32 sys_rsx_attribute(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5)
+/*
+* lv2 SysCall 677 (0x2A5): sys_rsx_attribute
+*/
+s32 sys_rsx_attribute(u32 packageId, u32 a2, u32 a3, u32 a4, u32 a5)
 {
-	sys_rsx.todo("sys_rsx_attribute(a1=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", a1, a2, a3, a4, a5);
+	sys_rsx.todo("sys_rsx_attribute(packageId=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", packageId, a2, a3, a4, a5);

 	return CELL_OK;
 }
@@ -5,11 +5,11 @@ s32 sys_rsx_device_open();
 s32 sys_rsx_device_close();
 s32 sys_rsx_memory_allocate(vm::ps3::ptr<u32> mem_handle, vm::ps3::ptr<u64> mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7);
 s32 sys_rsx_memory_free(u32 mem_handle);
-s32 sys_rsx_context_allocate(vm::ps3::ptr<u32> context_id, vm::ps3::ptr<u32> lpar_dma_control, vm::ps3::ptr<u32> lpar_driver_info, vm::ps3::ptr<u32> lpar_reports, u64 mem_ctx, u64 system_mode);
+s32 sys_rsx_context_allocate(vm::ps3::ptr<u32> context_id, vm::ps3::ptr<u64> lpar_dma_control, vm::ps3::ptr<u64> lpar_driver_info, vm::ps3::ptr<u64> lpar_reports, u64 mem_ctx, u64 system_mode);
 s32 sys_rsx_context_free(u32 context_id);
 s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags);
 s32 sys_rsx_context_iounmap(u32 context_id, u32 a2, u32 io_addr, u32 size);
 s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6);
-s32 sys_rsx_device_map(vm::ps3::ptr<u32> addr, vm::ps3::ptr<u32> a2, u32 dev_id);
+s32 sys_rsx_device_map(vm::ps3::ptr<u64> addr, vm::ps3::ptr<u64> a2, u32 dev_id);
 s32 sys_rsx_device_unmap(u32 dev_id);
 s32 sys_rsx_attribute(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5);
@@ -55,13 +55,13 @@ bool VirtualMemoryBlock::Map(u32 realaddr, u32 size, u32 addr)
 		return false;
 	}

-	for (u32 i = 0; i<m_mapped_memory.size(); ++i)
+	/*for (u32 i = 0; i<m_mapped_memory.size(); ++i)
 	{
 		if (addr >= m_mapped_memory[i].addr && addr + size - 1 <= m_mapped_memory[i].addr + m_mapped_memory[i].size - 1)
 		{
 			return false;
 		}
-	}
+	}*/

 	m_mapped_memory.emplace_back(addr, realaddr, size);
 	return true;
@@ -783,6 +783,7 @@ namespace vm
 			{
 				std::make_shared<block_t>(0x00010000, 0x1FFF0000), // main
 				std::make_shared<block_t>(0x20000000, 0x10000000), // user
+                std::make_shared<block_t>(0x40000000, 0x30000000), // rsx contexts
 				std::make_shared<block_t>(0xC0000000, 0x10000000), // video
 				std::make_shared<block_t>(0xD0000000, 0x10000000), // stack
 				std::make_shared<block_t>(0xE0000000, 0x20000000), // SPU reserved
@@ -16,6 +16,7 @@ namespace vm
 	{
 		main,
 		user_space,
+        rsx_context,
 		video,
 		stack,
 		
@@ -175,9 +175,16 @@ void D3D12GSRender::prepare_render_targets(ID3D12GraphicsCommandList *copycmdlis
 		rsx::method_registers.clear_color_b() / 255.f,
 		rsx::method_registers.clear_color_a() / 255.f,
 	};
+
+    u32 clip_width = rsx::method_registers.surface_clip_width();
+    u32 clip_height = rsx::method_registers.surface_clip_height();
+
+    if (clip_height == 0 || clip_width == 0)
+        return;
+
 	m_rtts.prepare_render_target(copycmdlist,
 		rsx::method_registers.surface_color(), rsx::method_registers.surface_depth_fmt(),
-		rsx::method_registers.surface_clip_width(), rsx::method_registers.surface_clip_height(),
+        clip_width, clip_height,
 		rsx::method_registers.surface_color_target(),
 		get_color_surface_addresses(), get_zeta_surface_address(),
 		m_device.Get(), clear_color, 1.f, 0);
@@ -7,11 +7,21 @@

 struct CellGcmControl
 {
-	atomic_be_t<u32> put;
-	atomic_be_t<u32> get;
-	atomic_be_t<u32> ref;
+    u8 resv[0x40];
+    atomic_be_t<u32> put;
+    atomic_be_t<u32> get;
+    atomic_be_t<u32> ref;
+    be_t<u32> unk[2];
+    be_t<u32> unk1;
 };

+/*struct CellGcmControl
+{
+    atomic_be_t<u32> put;
+    atomic_be_t<u32> get;
+    atomic_be_t<u32> ref;
+};*/
+
 struct CellGcmConfig
 {
 	be_t<u32> localAddress;
@@ -1,7 +1,4 @@
-#pragma once
-
 #include "stdafx.h"
-
 #include "GLGSRender.h"
 #include "GLTextureCache.h"

@@ -5,6 +5,7 @@
 #include "RSXThread.h"

 #include "Emu/Cell/PPUCallback.h"
+#include "Emu/Cell/lv2/sys_rsx.h"

 #include "Common/BufferUtils.h"
 #include "rsx_methods.h"
@@ -57,27 +58,43 @@ namespace rsx
 				//}
 			}

-			case CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT:
-				return 0x100000 + offset; // TODO: Properly implement
+			case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL:
+                return 0x40301400 + offset; // not sure if this should be 0x40300000 or offset to the actual reports, lets try reports for now
+				//return 0x100000 + offset; // TODO: Properly implement

 			case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN:
-				return 0x800 + offset;	// TODO: Properly implement
+            {
+                if (u32 result = RSXIOMem.RealAddr(0x0e000000 + offset))
+                {
+                    return result;
+                }
+
+                fmt::throw_exception("GetAddress(offset=0x%x, location=0x%x): RSXIO memory not mapped" HERE, offset, location);
+
+                //if (fxm::get<GSRender>()->strict_ordering[offset >> 20])
+                //{
+                //	_mm_mfence(); // probably doesn't have any effect on current implementation
+                //}
+            }

 			case CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0:
-				return 0x40 + offset; // TODO: Properly implement
+                fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0 (offset=0x%x, location=0x%x)" HERE, offset, location);

 			case CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0:
 				fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 (offset=0x%x, location=0x%x)" HERE, offset, location);

 			case CELL_GCM_CONTEXT_DMA_SEMAPHORE_RW:
 			case CELL_GCM_CONTEXT_DMA_SEMAPHORE_R:
-				return 0x100 + offset; // TODO: Properly implement
+                return 0x40300000 + offset; // this offset also doesnt seem like its right, but it works for now so w/e
+				//return 0x100 + offset; // TODO: Properly implement

 			case CELL_GCM_CONTEXT_DMA_DEVICE_RW:
-				fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_DEVICE_RW (offset=0x%x, location=0x%x)" HERE, offset, location);
+                return 0x40000000 + offset;
+				//fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_DEVICE_RW (offset=0x%x, location=0x%x)" HERE, offset, location);

 			case CELL_GCM_CONTEXT_DMA_DEVICE_R:
-				fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_DEVICE_R (offset=0x%x, location=0x%x)" HERE, offset, location);
+                return 0x40000000 + offset;
+				//fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_DEVICE_R (offset=0x%x, location=0x%x)" HERE, offset, location);

 			default:
 				fmt::throw_exception("Invalid location (offset=0x%x, location=0x%x)" HERE, offset, location);
@@ -386,7 +403,7 @@ namespace rsx
 				if (get_system_time() - start_time > vblank_count * 1000000 / 60)
 				{
 					vblank_count++;
-
+                    sys_rsx_context_attribute(0x55555555, 0xFED, 1, 0, 0, 0);
 					if (vblank_handler)
 					{
 						intr_thread->cmd_list
@@ -401,6 +418,8 @@ namespace rsx

 					continue;
 				}
+                while (Emu.IsPaused())
+                    std::this_thread::sleep_for(10ms);

 				std::this_thread::sleep_for(1ms); // hack
 			}
@@ -500,7 +519,7 @@ namespace rsx
 				u32 reg = ((cmd & RSX_METHOD_NON_INCREMENT_CMD_MASK) == RSX_METHOD_NON_INCREMENT_CMD) ? first_cmd : first_cmd + i;
 				u32 value = args[i];

-				//LOG_NOTICE(RSX, "%s(0x%x) = 0x%x", get_method_name(reg).c_str(), reg, value);
+				//LOG_WARNING(RSX, "%s(0x%x) = 0x%x", get_method_name(reg).c_str(), reg, value);

 				method_registers.decode(reg, value);

@@ -142,6 +142,8 @@ namespace rsx
 		u32 gcm_current_buffer;
 		u32 ctxt_addr;
 		u32 label_addr;
+        u32 nv406e_semaphore_addr;
+        u32 nv4097_semaphore_index;

 		u32 local_mem_addr, main_mem_addr;
 		bool strict_ordering[0x1000];
@@ -968,7 +968,7 @@ rsx::blit_engine::context_dma rsx::blit_engine::to_context_dma(u32 in)
 {
 	switch (in)
 	{
-	case CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT: return rsx::blit_engine::context_dma::to_memory_get_report;
+	case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL: return rsx::blit_engine::context_dma::to_memory_get_report;
 	case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN: return rsx::blit_engine::context_dma::report_location_main;
 	case CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER: return rsx::blit_engine::context_dma::memory_host_buffer;
 	}
@@ -704,7 +704,7 @@ enum
 {
 	CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER = 0xFEED0000, // Local memory
 	CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER = 0xFEED0001, // Main memory
-	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT = 0x66626660,
+	CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL = 0x66626660,
 	CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN = 0xBAD68000,
 	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 = 0x6660420F,

@@ -6,6 +6,7 @@
 #include "rsx_utils.h"
 #include "rsx_decode.h"
 #include "Emu/Cell/PPUCallback.h"
+#include "Emu/Cell/lv2/sys_rsx.h"

 #include <sstream>
 #include <cereal/archives/binary.hpp>
@@ -58,11 +59,23 @@ namespace rsx
 			rsx->ctrl->ref.exchange(arg);
 		}

+        void set_context_dma_semaphore(thread* rsx, u32 _reg, u32 arg)
+        {
+            rsx->nv406e_semaphore_addr = arg;
+        }
+
 		void semaphore_acquire(thread* rsx, u32 _reg, u32 arg)
 		{
 			//TODO: dma
-			while (vm::ps3::read32(rsx->label_addr + method_registers.semaphore_offset_406e()) != arg)
+			//while (vm::ps3::read32(rsx->label_addr + method_registers.semaphore_offset_406e()) != arg)
+            const u32 addr = get_address(method_registers.semaphore_offset_406e(), rsx->nv406e_semaphore_addr);
+            //todo: make me atomic
+            while (vm::ps3::read32(addr) != arg)
 			{
+                // todo: why does this one keep hanging? is it vsh system semaphore? whats actually pushing this to the command buffer?!
+                if (addr == 0x40000030)
+                    break;
+
 				if (Emu.IsStopped())
 					break;

@@ -73,10 +86,35 @@ namespace rsx
 		void semaphore_release(thread* rsx, u32 _reg, u32 arg)
 		{
 			//TODO: dma
-			vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_406e(), arg);
+			//vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_406e(), arg);
+            const u32 addr = get_address(method_registers.semaphore_offset_406e(), rsx->nv406e_semaphore_addr);
+            vm::ps3::write32(addr, arg);
 		}
 	}

+    struct RsxSemaphore {
+        be_t<u32> val;
+        be_t<u32> pad;
+        be_t<u64> timestamp;
+    };
+
+    struct RsxNotify {
+        be_t<u64> timestamp;
+        be_t<u64> zero;
+    };
+
+    struct RsxReport {
+        be_t<u64> timestamp;
+        be_t<u32> val;
+        be_t<u32> pad;
+    };
+
+    struct RsxReports {
+        RsxSemaphore semaphore[0x100];
+        RsxNotify notify[64];
+        RsxReport report[2048];
+    };
+
 	namespace nv4097
 	{
 		void clear(thread* rsx, u32 _reg, u32 arg)
@@ -93,6 +131,11 @@ namespace rsx
 			}
 		}

+        /*void set_context_dma_semaphore(thread* rsx, u32 _reg, u32 arg)
+        {
+            rsx->nv4097_semaphore_index = arg >> 4;
+        }*/
+
 		void texture_read_semaphore_release(thread* rsx, u32 _reg, u32 arg)
 		{
 			if (!rsx->do_method(NV4097_TEXTURE_READ_SEMAPHORE_RELEASE, arg))
@@ -101,7 +144,15 @@ namespace rsx
 			}

 			//TODO: dma
-			vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_4097(), arg);
+			//vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_4097(), arg);
+            //const u32 addr = get_address(method_registers.semaphore_offset_4097(), rsx->nv4097_semaphore_index);
+            //vm::ps3::write32(addr, arg);
+            const u32 index = method_registers.semaphore_offset_4097() >> 4;
+            //LOG_ERROR(RSX, "readrelease: 0x%x, 0x%x, addr:0x%x", arg, index, rsx->label_addr);
+            auto& sema = vm::ps3::_ref<RsxReports>(rsx->label_addr);
+            sema.semaphore[index].val = arg;
+            sema.semaphore[index].pad = 0;
+            sema.semaphore[index].timestamp = rsx->timestamp();
 		}

 		void back_end_write_semaphore_release(thread* rsx, u32 _reg, u32 arg)
@@ -112,8 +163,18 @@ namespace rsx
 			}

 			//TODO: dma
-			vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_4097(),
-				(arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff));
+			//vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_4097(),
+			//	(arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff));
+            //const u32 addr = get_address(method_registers.semaphore_offset_4097(), rsx->nv4097_semaphore_addr);
+            //vm::ps3::write32(addr, (arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff));
+            const u32 index = method_registers.semaphore_offset_4097() >> 4;
+            u32 val = (arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff);
+            //LOG_ERROR(RSX, "wriuterelease: 0x%x, 0x%x, addr:0x%x", val, index, rsx->label_addr);
+            auto& sema = vm::ps3::_ref<RsxReports>(rsx->label_addr);
+            sema.semaphore[index].val = val;
+            sema.semaphore[index].pad = 0;
+            sema.semaphore[index].timestamp = rsx->timestamp();
+
 		}

 		template<u32 id, u32 index, int count, typename type>
@@ -323,10 +384,10 @@ namespace rsx

 			switch (report_dma)
 			{
-			case blit_engine::context_dma::to_memory_get_report: location = CELL_GCM_LOCATION_LOCAL; break;
-			case blit_engine::context_dma::report_location_main:
-			case blit_engine::context_dma::memory_host_buffer: 
-				location = CELL_GCM_LOCATION_MAIN; break;
+			case blit_engine::context_dma::to_memory_get_report: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL; break;
+            case blit_engine::context_dma::report_location_main: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN; break;
+            case blit_engine::context_dma::memory_host_buffer: location = CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER; break;
+				//location = CELL_GCM_LOCATION_MAIN; break;
 			default:
 				LOG_WARNING(RSX, "nv4097::get_report: bad report dma: 0x%x", (u8)report_dma);
 				return;
@@ -353,7 +414,7 @@ namespace rsx
 				break;
 			}

-			//result->padding = 0;
+			result->padding = 0;
 		}

 		void clear_report_value(thread* rsx, u32 _reg, u32 arg)
@@ -472,6 +533,7 @@ namespace rsx
 			if (in_origin != blit_engine::transfer_origin::corner)
 			{
 				LOG_ERROR(RSX, "NV3089_IMAGE_IN_SIZE: unknown origin (%d)", (u8)in_origin);
+                return;
 			}

 			if (operation != rsx::blit_engine::transfer_operation::srccopy)
@@ -845,31 +907,14 @@ namespace rsx
 			}
 			Emu.Pause();
 		}
-
-		double limit = 0.;
-		switch (g_cfg.video.frame_limit)
-		{
-		case frame_limit_type::none: limit = 0.; break;
-		case frame_limit_type::_59_94: limit = 59.94; break;
-		case frame_limit_type::_50: limit = 50.; break;
-		case frame_limit_type::_60: limit = 60.; break;
-		case frame_limit_type::_30: limit = 30.; break;
-		case frame_limit_type::_auto: limit = rsx->fps_limit; break; // TODO
-		}
-		if (limit)
-		{
-			std::this_thread::sleep_for(std::chrono::milliseconds((s64)(1000.0 / limit - rsx->timer_sync.GetElapsedTimeInMilliSec())));
-			rsx->timer_sync.Start();
-		}
 		
 		rsx->gcm_current_buffer = arg;
 		rsx->flip(arg);
 		// After each flip PS3 system is executing a routine that changes registers value to some default.
 		// Some game use this default state (SH3).
-		rsx->reset();
+		//rsx->reset(); // moved to 'actual' rsx flip command

 		rsx->last_flip_time = get_system_time() - 1000000;
-		rsx->gcm_current_buffer = arg;
 		rsx->flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE;

 		if (rsx->flip_handler)
@@ -887,6 +932,7 @@ namespace rsx

 	void user_command(thread* rsx, u32, u32 arg)
 	{
+        sys_rsx_context_attribute(0x55555555, 0xFEF, 0, arg, 0, 0);
 		if (rsx->user_handler)
 		{
 			rsx->intr_thread->cmd_list
@@ -900,6 +946,46 @@ namespace rsx
 		}
 	}

+    namespace gcm
+    {
+        // not entirely sure which one should actually do the flip, or if these should be handled seperately,
+        // so for now lets flip in queue and just let the driver deal with it
+        template<u32 index>
+        struct driver_flip
+        {
+            static void impl(thread* rsx, u32 _reg, u32 arg)
+            {
+                double limit = 0.;
+                switch (g_cfg.video.frame_limit)
+                {
+                case frame_limit_type::none: limit = 0.; break;
+                case frame_limit_type::_59_94: limit = 59.94; break;
+                case frame_limit_type::_50: limit = 50.; break;
+                case frame_limit_type::_60: limit = 60.; break;
+                case frame_limit_type::_30: limit = 30.; break;
+                case frame_limit_type::_auto: limit = rsx->fps_limit; break; // TODO
+                }
+                if (limit)
+                {
+                    std::this_thread::sleep_for(std::chrono::milliseconds((s64)(1000.0 / limit - rsx->timer_sync.GetElapsedTimeInMilliSec())));
+                    rsx->timer_sync.Start();
+                }
+                rsx->reset(); // fixes kh, so lets leave it here and see what happens
+                sys_rsx_context_attribute(0x55555555, 0x102, index, arg, 0, 0);
+            }
+        };
+
+        template<u32 index>
+        struct queue_flip
+        {
+            static void impl(thread* rsx, u32 _reg, u32 arg)
+            {
+                flip_command(rsx, _reg, arg);
+                sys_rsx_context_attribute(0x55555555, 0x103, index, arg, 0, 0);
+            }
+        };
+    }
+
 	void rsx_state::reset()
 	{
 		//setup method registers
@@ -971,7 +1057,7 @@ namespace rsx
 		registers[NV4097_SET_SURFACE_FORMAT] = (8 << 0) | (2 << 5) | (0 << 12) | (1 << 16) | (1 << 24);

 		// rsx dma initial values
-		registers[NV4097_SET_CONTEXT_DMA_REPORT] = CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT;
+		registers[NV4097_SET_CONTEXT_DMA_REPORT] = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL;
 		registers[NV406E_SET_CONTEXT_DMA_SEMAPHORE] = CELL_GCM_CONTEXT_DMA_SEMAPHORE_RW;
 		registers[NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN] = CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER;
 		registers[NV309E_SET_CONTEXT_DMA_IMAGE] = CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER;
@@ -1081,10 +1167,17 @@ namespace rsx
 		methods[NV4097_SET_SURFACE_COLOR_BOFFSET]         = nullptr;
 		methods[NV4097_SET_SURFACE_PITCH_B]               = nullptr;
 		methods[NV4097_SET_SURFACE_COLOR_TARGET]          = nullptr;
+        methods[0x224 >> 2]                               = nullptr;
+        methods[0x228 >> 2]                               = nullptr;
+        methods[0x230 >> 2]                               = nullptr;
 		methods[NV4097_SET_SURFACE_PITCH_Z]               = nullptr;
 		methods[NV4097_INVALIDATE_ZCULL]                  = nullptr;
 		methods[NV4097_SET_CYLINDRICAL_WRAP]              = nullptr;
 		methods[NV4097_SET_CYLINDRICAL_WRAP1]             = nullptr;
+        methods[0x240 >> 2]                               = nullptr;
+        methods[0x244 >> 2]                               = nullptr;
+        methods[0x248 >> 2]                               = nullptr;
+        methods[0x24C >> 2]                               = nullptr;
 		methods[NV4097_SET_SURFACE_PITCH_C]               = nullptr;
 		methods[NV4097_SET_SURFACE_PITCH_D]               = nullptr;
 		methods[NV4097_SET_SURFACE_COLOR_COFFSET]         = nullptr;
@@ -1153,6 +1246,7 @@ namespace rsx
 		methods[NV4097_SET_FOG_MODE]                      = nullptr;
 		methods[NV4097_SET_FOG_PARAMS]                    = nullptr;
 		methods[NV4097_SET_FOG_PARAMS + 1]                = nullptr;
+        methods[0x8d8 >> 2]                               = nullptr;
 		methods[NV4097_SET_SHADER_PROGRAM]                = nullptr;
 		methods[NV4097_SET_VERTEX_TEXTURE_OFFSET]         = nullptr;
 		methods[NV4097_SET_VERTEX_TEXTURE_FORMAT]         = nullptr;
@@ -1236,6 +1330,7 @@ namespace rsx
 		methods[NV4097_SET_TEXTURE_BORDER_COLOR]          = nullptr;
 		methods[NV4097_SET_VERTEX_DATA4F_M]               = nullptr;
 		methods[NV4097_SET_COLOR_KEY_COLOR]               = nullptr;
+        methods[0x1d04 >> 2]                              = nullptr;
 		methods[NV4097_SET_SHADER_CONTROL]                = nullptr;
 		methods[NV4097_SET_INDEXED_CONSTANT_READ_LIMITS]  = nullptr;
 		methods[NV4097_SET_SEMAPHORE_OFFSET]              = nullptr;
@@ -1362,6 +1457,8 @@ namespace rsx
 		bind_array<GCM_FLIP_HEAD, 1, 2, nullptr>();
 		bind_array<GCM_DRIVER_QUEUE, 1, 8, nullptr>();

+        bind_array<(0x400 >> 2), 1, 0x10, nullptr>();
+        bind_array<(0x440 >> 2), 1, 0x20, nullptr>();
 		bind_array<NV4097_SET_ANISO_SPREAD, 1, 16, nullptr>();
 		bind_array<NV4097_SET_VERTEX_TEXTURE_OFFSET, 1, 8 * 4, nullptr>();
 		bind_array<NV4097_SET_VERTEX_DATA_SCALED4S_M, 1, 32, nullptr>();
@@ -1384,6 +1481,7 @@ namespace rsx

 		// NV406E
 		bind<NV406E_SET_REFERENCE, nv406e::set_reference>();
+        bind<NV406E_SET_CONTEXT_DMA_SEMAPHORE, nv406e::set_context_dma_semaphore>();
 		bind<NV406E_SEMAPHORE_ACQUIRE, nv406e::semaphore_acquire>();
 		bind<NV406E_SEMAPHORE_RELEASE, nv406e::semaphore_release>();

@@ -1398,6 +1496,7 @@ namespace rsx
 		*/

 		// NV4097
+        //bind<NV4097_SET_CONTEXT_DMA_SEMAPHORE, nv4097::set_context_dma_semaphore>();
 		bind<NV4097_TEXTURE_READ_SEMAPHORE_RELEASE, nv4097::texture_read_semaphore_release>();
 		bind<NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE, nv4097::back_end_write_semaphore_release>();
 		bind<NV4097_SET_BEGIN_END, nv4097::set_begin_end>();
@@ -1455,9 +1554,13 @@ namespace rsx
 		//NV0039
 		bind<NV0039_BUFFER_NOTIFY, nv0039::buffer_notify>();

-		// custom methods
-		bind<GCM_FLIP_COMMAND, flip_command>();
+		// lv1 hypervisor
 		bind_array<GCM_SET_USER_COMMAND, 1, 2, user_command>();
+        bind_range<GCM_FLIP_HEAD, 1, 2, gcm::driver_flip>();
+        bind_range<GCM_DRIVER_QUEUE, 1, 8, gcm::queue_flip>();
+
+        // custom 
+        bind<GCM_FLIP_COMMAND, flip_command>();

 		return true;	
 	}();
@@ -381,6 +381,7 @@ void Emulator::Load()
 			}
 		}

+		// Booting disc game
 		if (_cat == "DG" && bdvd_dir.empty())
 		{
 			// Mount /dev_bdvd/ if necessary
@@ -390,6 +391,7 @@ void Emulator::Load()
 			}
 		}

+		// Booting patch data
 		if (_cat == "GD" && bdvd_dir.empty())
 		{
 			// Load /dev_bdvd/ from game list if available
@@ -397,24 +399,19 @@ void Emulator::Load()
 			{
 				bdvd_dir = node.Scalar();
 			}
-		}
-
-		if (!bdvd_dir.empty() && fs::is_dir(bdvd_dir))
-		{
-			vfs::mount("dev_bdvd", bdvd_dir);
-			LOG_NOTICE(LOADER, "Disc: %s", vfs::get("/dev_bdvd"));
+			else
+			{
+				LOG_FATAL(LOADER, "Disc directory not found. Try to run the game from the actual game disc directory.");
+			}
 		}

 		// Check /dev_bdvd/
-		if (_cat == "DG")
+		if (!bdvd_dir.empty() && fs::is_dir(bdvd_dir))
 		{
 			fs::file sfb_file;

-			if (bdvd_dir.empty())
-			{
-				LOG_ERROR(LOADER, "Failed to mount disc directory for the disc game %s", m_title_id);
-				return;
-			}
+			vfs::mount("dev_bdvd", bdvd_dir);
+			LOG_NOTICE(LOADER, "Disc: %s", vfs::get("/dev_bdvd"));

 			if (!sfb_file.open(vfs::get("/dev_bdvd/PS3_DISC.SFB")) || sfb_file.size() < 4 || sfb_file.read<u32>() != ".SFB"_u32)
 			{
@@ -422,12 +419,25 @@ void Emulator::Load()
 				return;
 			}

+			const std::string bdvd_title_id = psf::get_string(psf::load_object(fs::file{vfs::get("/dev_bdvd/PS3_GAME/PARAM.SFO")}), "TITLE_ID");
+
+			if (bdvd_title_id != m_title_id)
+			{
+				LOG_ERROR(LOADER, "Unexpected disc directory for the disc game %s (found %s)", m_title_id, bdvd_title_id);
+				return;
+			}
+
 			// Store /dev_bdvd/ location
 			games[m_title_id] = bdvd_dir;
 			YAML::Emitter out;
 			out << games;
 			fs::file(fs::get_config_dir() + "/games.yml", fs::rewrite).write(out.c_str(), out.size());
 		}
+		else if (_cat == "DG" || _cat == "GD")
+		{
+			LOG_ERROR(LOADER, "Failed to mount disc directory for the disc game %s", m_title_id);
+			return;
+		}

 		// Check game updates
 		const std::string hdd0_boot = hdd0_game + m_title_id + "/USRDIR/EBOOT.BIN";
@@ -536,7 +546,7 @@ void Emulator::Load()
 			m_state = system_state::ready;
 			GetCallbacks().on_ready();
 			vm::ps3::init();
-			ppu_load_prx(ppu_prx, "");
+			ppu_load_prx(ppu_prx, m_path);
 		}
 		else if (spu_exec.open(elf_file) == elf_error::ok)
 		{
@@ -31,7 +31,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -95,4 +95,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
@@ -7,13 +7,13 @@
 	},
 	"cpu": {
 		"PPU": {
-			"precise": "This is the most accurate Interpreter, but very slow to play games with.\nYou may try this as a last resort if you encounter odd bugs or crashes.\nIf unsure, use PPU Interpreter Fast or PPU recompiler (LLVM).",
+			"precise": "This is the most accurate Interpreter, but very slow to play games with.\nYou may try this as a last resort if you encounter odd bugs or crashes.\nIf unsure, use PPU Interpreter Fast or PPU Recompiler (LLVM).",
 			"fast": "This is the fastest interpreter.\nTrades accuracy for speed, and it very rarely breaks games even in comparison to the Precise option.\nTry this if PPU Recompiler (LLVM) fails.",
 			"LLVM": "Recompiles the game's executable once before running it for the first time.\nThis is by far the fastest option and should always be used.\nShould you face compatibility issues, fall back to one of the Interpreters and retry.\nIf unsure, use this option."
 		},
 		"SPU": {
 			"precise": "This is extremely slow but may fix broken graphics in some games.",
-			"fast": "This is slower than the SPU recompiler but significantly faster than the precise interpreter.\nGames rarely need this however.",
+			"fast": "This is slower than the SPU Recompiler but significantly faster than the precise interpreter.\nGames rarely need this however.",
 			"ASMJIT": "This is the fastest option with very good compatibility.\nIf unsure, use this option.",
 			"LLVM": "This doesn't exist (yet)"
 		},
@@ -46,7 +46,7 @@
 		"comboboxes": {
 			"renderBox": "Vulkan is the fastest renderer. OpenGL is the most accurate renderer.\nIf unsure, use Vulkan. Should you have any compatibility issues, fall back to OpenGL.\nDirectX 12 is deprecated and should never be used.",
 			"resBox": "Leave this on 1280x720, every PS3 game is compatible with this resolution.\nSet it to 1920x1080 only if supported by the game. Lower resolutions may work but are not practical.\nHowever rarely due to emulation bugs some games will only render at low resolutions like 480p.",
-			"graphicsAdapterBox": "On multi GPU systems select which GPU to use in RPCS3 when using Vulkan or DirectX 12.\nThis is not needed whe using OpenGL.",
+			"graphicsAdapterBox": "On multi GPU systems select which GPU to use in RPCS3 when using Vulkan or DirectX 12.\nThis is not needed when using OpenGL.",
 			"aspectBox": "Leave this on 16:9 unless you have a 4:3 monitor.\nAuto also works well especially if you use a resolution that is not 720p.",
 			"frameLimitBox": "Auto is the most compatible option.\nSome games can work with frame limit off, but it may cause bugs and crashes.\nSet to off if you get severe hitching and stuttering."
 		},
@@ -61,19 +61,19 @@
 			"stretchToDisplayArea": "Overrides the aspect ratio and stretches the image to the full display area."
 		},
 		"debug": {
-			"glLegacyBuffers": "Enables use of classic openGL buffers which allows capturing tools to work with rpcs3 e.g RenderDoc.\nIf unsure, don't use this option.",
+			"glLegacyBuffers": "Enables use of classic OpenGL buffers which allows capturing tools to work with RPCS3 e.g RenderDoc.\nIf unsure, don't use this option.",
 			"scrictModeRendering": "Enforces strict compliance to the API specification.\nMight result in degraded performance in some games.\nCan resolve rare cases of missing graphics and flickering.\nIf unsure, don't use this option.",
 			"forceHighpZ": "Only useful when debugging differences in GPU hardware.\nNot necessary for average users.\nIf unsure, don't use this option.",
-			"debugOutput": "Enables the selected API's inbuilt debugging functionality.\nWill cause severe performance degradation especially with vulkan.\nOnly useful for developers.\nIf unsure, don't use this option.",
+			"debugOutput": "Enables the selected API's inbuilt debugging functionality.\nWill cause severe performance degradation especially with Vulkan.\nOnly useful for developers.\nIf unsure, don't use this option.",
 			"debugOverlay": "Provides a graphical overlay of various debugging information.\nIf unsure, don't use this option.",
 			"logProg": "Dump game shaders to file. Only useful to developers.\nIf unsure, don't use this option."
 		}
 	},
 	"input": {
-		"padHandlerBox": "If you want to use the keyboard to control, select the Keyboard option.\nYou can change the button mappings in Configuration --> Controls.\nIf you have a DualShock 4, select DualShock 4.\nWindows: If you have an Xbox controller, or another compatible device, use XInput.\nOlder controllers such as PS2 controllers with an adapter usually work fine with mmjoystick.\nCheck button mappings in the Windows control panel.\n\nLinux: evdev input is WIP.",
+		"padHandlerBox": "If you want to use the keyboard to control, select the Keyboard option.\nYou can change the button mappings in Configuration --> Controls.\nIf you have a DualShock 4, select DualShock 4.\nWindows: If you have an Xbox controller, or another compatible device, use XInput.\nOlder controllers such as PS2 controllers with an adapter usually work fine with MMJoystick.\nCheck button mappings in the Windows control panel.\n\nLinux: evdev input is WIP.",
 		"keyboardHandlerBox": "Some games support native keyboard input.\nBasic will work in these cases.",
 		"mouseHandlerBox": "Some games support native mouse input.\nBasic will work in these cases.",
-		"useFakeCamera": "Camera support is not implemented, leave this on null.",
+		"cameraBox": "Camera support is not implemented, leave this on null.",
 		"cameraTypeBox": "Camera support is not implemented, leave this on unknown."
 	},
 	"network": {
@@ -83,4 +83,4 @@
 		"sysLangBox": "Some games may fail to boot if the system language is not available in the game itself.\nOther games will switch language automatically to what is selected here.\nIt is recommended leaving this on a language supported by the game.",
 		"enableHostRoot": "Required for some Homebrew.\nIf unsure, don't use this option."
 	}
-}
+}
@@ -31,7 +31,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -61,7 +61,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -31,7 +31,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -30,7 +30,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -3,6 +3,8 @@

 #include <QApplication>
 #include <QCommandLineParser>
+#include <QFileInfo>
+#include <QTimer>

 #include "rpcs3_app.h"
 #ifdef _WIN32
@@ -34,9 +36,13 @@ int main(int argc, char** argv)

 	if (parser.positionalArguments().length() > 0)
 	{
-		Emu.SetPath(sstr(parser.positionalArguments().at(0)));
-		Emu.Load();
-		Emu.Run();
+		// Ugly workaround
+		QTimer::singleShot(2, [path = sstr(QFileInfo(parser.positionalArguments().at(0)).canonicalFilePath())]
+		{
+			Emu.SetPath(path);
+			Emu.Load();
+			Emu.Run();
+		});
 	}

 	return app.exec();
@@ -26,7 +26,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
    <OutputDirectory>release\</OutputDirectory>
    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
    <CharacterSet>Unicode</CharacterSet>
@@ -35,7 +35,7 @@
    <PrimaryOutput>rpcs3</PrimaryOutput>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
    <OutputDirectory>release\</OutputDirectory>
    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
    <CharacterSet>Unicode</CharacterSet>
@@ -44,7 +44,7 @@
    <PrimaryOutput>rpcs3</PrimaryOutput>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
    <OutputDirectory>debug\</OutputDirectory>
    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
    <CharacterSet>Unicode</CharacterSet>
@@ -53,7 +53,7 @@
    <PrimaryOutput>rpcs3</PrimaryOutput>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
    <OutputDirectory>debug\</OutputDirectory>
    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
    <CharacterSet>Unicode</CharacterSet>
@@ -68,6 +68,8 @@ void rpcs3_app::Init()
 	// Create connects to propagate events throughout Gui.
 	InitializeConnects();

+	RPCS3MainWin->Init();
+
 	setApplicationName("RPCS3");
 	RPCS3MainWin->show();

@@ -67,35 +67,28 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, const R
 	m_Tool_Bar->setContextMenuPolicy(Qt::PreventContextMenu);

 	// ToolBar Actions
-	m_catActHDD = { new QAction(""), QIcon(":/Icons/hdd_blue.png"), QIcon(":/Icons/hdd_gray.png") };
-	m_catActHDD.action->setIcon(xgui_settings->GetValue(GUI::cat_hdd_game).toBool() ? m_catActHDD.colored : m_catActHDD.gray);
+	m_catActHDD = { new QAction(""), QIcon(":/Icons/hdd_blue.png"), QIcon(":/Icons/hdd_gray.png"), xgui_settings->GetValue(GUI::cat_hdd_game).toBool() };
 	m_catActHDD.action->setToolTip(tr("Show HDD Categories"));

-	m_catActDisc = { new QAction(""), QIcon(":/Icons/disc_blue.png"), QIcon(":/Icons/disc_gray.png") };
-	m_catActDisc.action->setIcon(xgui_settings->GetValue(GUI::cat_disc_game).toBool() ? m_catActDisc.colored : m_catActDisc.gray);
+	m_catActDisc = { new QAction(""), QIcon(":/Icons/disc_blue.png"), QIcon(":/Icons/disc_gray.png"), xgui_settings->GetValue(GUI::cat_disc_game).toBool() };
 	m_catActDisc.action->setToolTip(tr("Show Disc Categories"));

-	m_catActHome = { new QAction(""), QIcon(":/Icons/home_blue.png"), QIcon(":/Icons/home_gray.png") };
-	m_catActHome.action->setIcon(xgui_settings->GetValue(GUI::cat_home).toBool() ? m_catActHome.colored : m_catActHome.gray);
+	m_catActHome = { new QAction(""), QIcon(":/Icons/home_blue.png"), QIcon(":/Icons/home_gray.png"), xgui_settings->GetValue(GUI::cat_home).toBool() };
 	m_catActHome.action->setToolTip(tr("Show Home Categories"));

-	m_catActAudioVideo = { new QAction(""), QIcon(":/Icons/media_blue.png"), QIcon(":/Icons/media_gray.png") };
-	m_catActAudioVideo.action->setIcon(xgui_settings->GetValue(GUI::cat_audio_video).toBool() ? m_catActAudioVideo.colored : m_catActAudioVideo.gray);
+	m_catActAudioVideo = { new QAction(""), QIcon(":/Icons/media_blue.png"), QIcon(":/Icons/media_gray.png"), xgui_settings->GetValue(GUI::cat_audio_video).toBool() };
 	m_catActAudioVideo.action->setToolTip(tr("Show Audio/Video Categories"));

-	m_catActGameData = { new QAction(""), QIcon(":/Icons/data_blue.png"), QIcon(":/Icons/data_gray.png") };
-	m_catActGameData.action->setIcon(xgui_settings->GetValue(GUI::cat_game_data).toBool() ? m_catActGameData.colored : m_catActGameData.gray);
+	m_catActGameData = { new QAction(""), QIcon(":/Icons/data_blue.png"), QIcon(":/Icons/data_gray.png"), xgui_settings->GetValue(GUI::cat_game_data).toBool() };
 	m_catActGameData.action->setToolTip(tr("Show GameData Categories"));

-	m_catActUnknown = { new QAction(""), QIcon(":/Icons/unknown_blue.png"), QIcon(":/Icons/unknown_gray.png") };
-	m_catActUnknown.action->setIcon(xgui_settings->GetValue(GUI::cat_unknown).toBool() ? m_catActUnknown.colored : m_catActUnknown.gray);
+	m_catActUnknown = { new QAction(""), QIcon(":/Icons/unknown_blue.png"), QIcon(":/Icons/unknown_gray.png"), xgui_settings->GetValue(GUI::cat_unknown).toBool() };
 	m_catActUnknown.action->setToolTip(tr("Show Unknown Categories"));

-	m_catActOther = { new QAction(""), QIcon(":/Icons/other_blue.png"), QIcon(":/Icons/other_gray.png") };
-	m_catActOther.action->setIcon(xgui_settings->GetValue(GUI::cat_other).toBool() ? m_catActOther.colored : m_catActOther.gray);
+	m_catActOther = { new QAction(""), QIcon(":/Icons/other_blue.png"), QIcon(":/Icons/other_gray.png"), xgui_settings->GetValue(GUI::cat_other).toBool() };
 	m_catActOther.action->setToolTip(tr("Show Other Categories"));

-	m_categoryButtons = { m_catActHDD , m_catActDisc, m_catActHome, m_catActAudioVideo, m_catActGameData, m_catActUnknown, m_catActOther };
+	m_categoryButtons = { &m_catActHDD , &m_catActDisc, &m_catActHome, &m_catActAudioVideo, &m_catActGameData, &m_catActUnknown, &m_catActOther };

 	m_categoryActs = new QActionGroup(m_Tool_Bar);
 	m_categoryActs->addAction(m_catActHDD.action);
@@ -108,11 +101,9 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, const R
 	m_categoryActs->setEnabled(m_isListLayout);

 	m_modeActList = { new QAction(""), QIcon(":/Icons/list_blue.png"), QIcon(":/Icons/list_gray.png") };
-	m_modeActList.action->setIcon(m_isListLayout ? m_modeActList.colored : m_modeActList.gray);
 	m_modeActList.action->setToolTip(tr("Enable List Mode"));

 	m_modeActGrid = { new QAction(""), QIcon(":/Icons/grid_blue.png"), QIcon(":/Icons/grid_gray.png") };
-	m_modeActGrid.action->setIcon(m_isListLayout ? m_modeActGrid.gray : m_modeActGrid.colored);
 	m_modeActGrid.action->setToolTip(tr("Enable Grid Mode"));

 	m_modeActs = new QActionGroup(m_Tool_Bar);
@@ -152,6 +143,8 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, const R
 	m_Game_Dock->addToolBar(m_Tool_Bar);
 	setWidget(m_Game_Dock);

+	RepaintToolBarIcons();
+
 	bool showText = (m_Icon_Size_Str != GUI::gl_icon_key_small && m_Icon_Size_Str != GUI::gl_icon_key_tiny);
 	m_xgrid = new game_list_grid(m_Icon_Size, m_Icon_Color, m_Margin_Factor, m_Text_Factor, showText);

@@ -565,6 +558,7 @@ void game_list_frame::doubleClickedSlot(const QModelIndex& index)
 		{
 			LOG_SUCCESS(LOADER, "Boot from gamelist per doubleclick: done");
 			RequestAddRecentGame(q_string_pair(qstr(Emu.GetBoot()), qstr("[" + m_game_data[i].info.serial + "] " + m_game_data[i].info.name)));
+			Refresh(true);
 		}
 	}
 	else
@@ -782,7 +776,8 @@ bool game_list_frame::GetToolBarVisible()

 void game_list_frame::SetCategoryActIcon(const int& id, const bool& active)
 {
-	m_categoryButtons.at(id).action->setIcon(active ? m_categoryButtons.at(id).colored : m_categoryButtons.at(id).gray);
+	m_categoryButtons.at(id)->action->setIcon(active ? m_categoryButtons.at(id)->colored : m_categoryButtons.at(id)->gray);
+	m_categoryButtons.at(id)->isActive = active;
 }

 void game_list_frame::SetSearchText(const QString& text)
@@ -791,6 +786,33 @@ void game_list_frame::SetSearchText(const QString& text)
 	Refresh();
 }

+void game_list_frame::RepaintToolBarIcons()
+{
+	QColor newColor = xgui_settings->GetValue(GUI::gl_toolIconColor).value<QColor>();
+
+	m_catActHDD.colored = gui_settings::colorizedIcon(QIcon(":/Icons/hdd_blue.png"), GUI::gl_tool_icon_color, newColor, true);
+	m_catActDisc.colored = gui_settings::colorizedIcon(QIcon(":/Icons/disc_blue.png"), GUI::gl_tool_icon_color, newColor, true);
+	m_catActHome.colored = gui_settings::colorizedIcon(QIcon(":/Icons/home_blue.png"), GUI::gl_tool_icon_color, newColor);
+	m_catActAudioVideo.colored = gui_settings::colorizedIcon(QIcon(":/Icons/media_blue.png"), GUI::gl_tool_icon_color, newColor, true);
+	m_catActGameData.colored = gui_settings::colorizedIcon(QIcon(":/Icons/data_blue.png"), GUI::gl_tool_icon_color, newColor, true);
+	m_catActUnknown.colored = gui_settings::colorizedIcon(QIcon(":/Icons/unknown_blue.png"), GUI::gl_tool_icon_color, newColor, true);
+	m_catActOther.colored = gui_settings::colorizedIcon(QIcon(":/Icons/other_blue.png"), GUI::gl_tool_icon_color, newColor);
+
+	for (const auto& butt : m_categoryButtons)
+	{
+		butt->action->setIcon(butt->isActive ? butt->colored : butt->gray);
+	}
+
+	m_modeActList.colored = gui_settings::colorizedIcon(QIcon(":/Icons/list_blue.png"), GUI::gl_tool_icon_color, newColor);
+	m_modeActList.action->setIcon(m_isListLayout ? m_modeActList.colored : m_modeActList.gray);
+
+	m_modeActGrid.colored = gui_settings::colorizedIcon(QIcon(":/Icons/grid_blue.png"), GUI::gl_tool_icon_color, newColor);
+	m_modeActGrid.action->setIcon(m_isListLayout ? m_modeActGrid.gray : m_modeActGrid.colored);
+
+	m_Slider_Size->setStyleSheet(QString("QSlider::handle:horizontal{ background: rgba(%1, %2, %3, %4); }")
+		.arg(newColor.red()).arg(newColor.green()).arg(newColor.blue()).arg(newColor.alpha()));
+}
+
 void game_list_frame::closeEvent(QCloseEvent *event)
 {
 	QDockWidget::closeEvent(event);
@@ -863,7 +885,7 @@ void game_list_frame::PopulateGameGrid(uint maxCols, const QSize& image_size, co

 	std::string selected_item = CurrentSelectionIconPath();

-	delete m_xgrid;
+	m_xgrid->deleteLater();

 	bool showText = m_Icon_Size_Str != GUI::gl_icon_key_small && m_Icon_Size_Str != GUI::gl_icon_key_tiny;

@@ -162,6 +162,7 @@ typedef struct Tool_Bar_Button
 	QAction* action;
 	QIcon colored;
 	QIcon gray;
+	bool isActive;
 };

 class game_list_frame : public QDockWidget {
@@ -194,6 +195,7 @@ public Q_SLOTS:
 	void SetToolBarVisible(const bool& showToolBar);
 	void SetCategoryActIcon(const int& id, const bool& active);
 	void SetSearchText(const QString& text);
+	void RepaintToolBarIcons();

 private Q_SLOTS:
 	void Boot(int row);
@@ -256,7 +258,7 @@ private:
 	Tool_Bar_Button m_catActUnknown;
 	Tool_Bar_Button m_catActOther;

-	QList<Tool_Bar_Button> m_categoryButtons;
+	QList<Tool_Bar_Button*> m_categoryButtons;

 	QActionGroup* m_categoryActs;

@@ -78,6 +78,53 @@ q_pair_list gui_settings::Var2List(const QVariant& var)
 	return list;
 }

+QIcon gui_settings::colorizedIcon(const QIcon& icon, const QColor& oldColor, const QColor& newColor, bool useSpecialMasks)
+{
+	QPixmap pixmap = icon.pixmap(icon.availableSizes().at(0));
+	QBitmap mask = pixmap.createMaskFromColor(oldColor, Qt::MaskOutColor);
+	pixmap.fill(newColor);
+	pixmap.setMask(mask);
+
+	// special masks for disc icon and others
+
+	if (useSpecialMasks)
+	{
+		auto saturatedColor = [](const QColor& col, float sat /* must be < 1 */)
+		{
+			int r = col.red() + sat * (255 - col.red());
+			int g = col.green() + sat * (255 - col.green());
+			int b = col.blue() + sat * (255 - col.blue());
+			return QColor(r, g, b, col.alpha());
+		};
+
+		QColor colorS1(Qt::white);
+		QPixmap pixmapS1 = icon.pixmap(icon.availableSizes().at(0));
+		QBitmap maskS1 = pixmapS1.createMaskFromColor(colorS1, Qt::MaskOutColor);
+		pixmapS1.fill(colorS1);
+		pixmapS1.setMask(maskS1);
+
+		QColor colorS2(0, 173, 246, 255);
+		QPixmap pixmapS2 = icon.pixmap(icon.availableSizes().at(0));
+		QBitmap maskS2 = pixmapS2.createMaskFromColor(colorS2, Qt::MaskOutColor);
+		pixmapS2.fill(saturatedColor(newColor, 0.6f));
+		pixmapS2.setMask(maskS2);
+
+		QColor colorS3(0, 132, 244, 255);
+		QPixmap pixmapS3 = icon.pixmap(icon.availableSizes().at(0));
+		QBitmap maskS3 = pixmapS3.createMaskFromColor(colorS3, Qt::MaskOutColor);
+		pixmapS3.fill(saturatedColor(newColor, 0.3f));
+		pixmapS3.setMask(maskS3);
+
+		QPainter painter(&pixmap);
+		painter.drawPixmap(QPoint(0, 0), pixmapS1);
+		painter.drawPixmap(QPoint(0, 0), pixmapS2);
+		painter.drawPixmap(QPoint(0, 0), pixmapS3);
+		painter.end();
+	}
+
+	return QIcon(pixmap);
+}
+
 void gui_settings::SetValue(const GUI_SAVE& entry, const QVariant& value)
 {
 	settings.beginGroup(entry.key);
@@ -7,6 +7,7 @@
 #include <QVariant>
 #include <QSize>
 #include <QColor>
+#include <QBitmap>

 typedef struct GUI_SAVE
 {
@@ -52,8 +53,10 @@ namespace GUI
 	const QString meta        = "Meta";
 	const QString fs          = "FileSystem";

-	const QColor mw_tool_bar_color = QColor(227, 227, 227, 255);
-	const QColor gl_icon_color     = QColor(209, 209, 209, 255);
+	const QColor mw_tool_bar_color  = QColor(227, 227, 227, 255);
+	const QColor mw_tool_icon_color = QColor(64, 64, 64, 255);
+	const QColor gl_icon_color      = QColor(209, 209, 209, 255);
+	const QColor gl_tool_icon_color = QColor(0, 100, 231, 255);

 	const GUI_SAVE rg_freeze  = GUI_SAVE(main_window, "recentGamesFrozen", false);
 	const GUI_SAVE rg_entries = GUI_SAVE(main_window, "recentGamesNames", QVariant::fromValue(q_pair_list()));
@@ -74,6 +77,7 @@ namespace GUI
 	const GUI_SAVE mw_gamelist       = GUI_SAVE( main_window, "gamelistVisible", true );
 	const GUI_SAVE mw_toolBarVisible = GUI_SAVE( main_window, "toolBarVisible",  true );
 	const GUI_SAVE mw_toolBarColor   = GUI_SAVE( main_window, "toolBarColor",    mw_tool_bar_color);
+	const GUI_SAVE mw_toolIconColor  = GUI_SAVE( main_window, "toolIconColor",   mw_tool_icon_color);
 	const GUI_SAVE mw_geometry       = GUI_SAVE( main_window, "geometry",        QByteArray() );
 	const GUI_SAVE mw_windowState    = GUI_SAVE( main_window, "windowState",     QByteArray() );
 	const GUI_SAVE mw_mwState        = GUI_SAVE( main_window, "wwState",         QByteArray() );
@@ -95,6 +99,7 @@ namespace GUI
 	const GUI_SAVE gl_textFactor     = GUI_SAVE( game_list, "textFactor",     (qreal) 2.0 );
 	const GUI_SAVE gl_marginFactor   = GUI_SAVE( game_list, "marginFactor",   (qreal) 0.09 );
 	const GUI_SAVE gl_toolBarVisible = GUI_SAVE( game_list, "toolBarVisible", false);
+	const GUI_SAVE gl_toolIconColor  = GUI_SAVE( game_list, "toolIconColor",  gl_tool_icon_color);

 	const GUI_SAVE fs_emulator_dir_list = GUI_SAVE(fs, "emulator_dir_list", QStringList());
 	const GUI_SAVE fs_dev_hdd0_list = GUI_SAVE(fs, "dev_hdd0_list", QStringList());
@@ -142,6 +147,15 @@ public:
 	QStringList GetStylesheetEntries();
 	QStringList GetGameListCategoryFilters();

+	/**
+		Creates a custom colored QIcon based on another QIcon
+		@param icon the icon to colorize
+		@param oldColor the current color of icon
+		@param newColor the desired color for the new icon
+		@param useSpecialMasks only used for icons with white parts and disc game icon
+	*/
+	static QIcon colorizedIcon(const QIcon& icon, const QColor& oldColor, const QColor& newColor, bool useSpecialMasks = false);
+
 public Q_SLOTS:
 	void Reset(bool removeMeta = false);

@@ -47,16 +47,32 @@
 inline std::string sstr(const QString& _in) { return _in.toUtf8().toStdString(); }

 main_window::main_window(QWidget *parent) : QMainWindow(parent), m_sys_menu_opened(false), ui(new Ui::main_window)
+{
+}
+
+main_window::~main_window()
+{
+}
+
+auto Pause = []()
+{
+	if (Emu.IsReady()) Emu.Run();
+	else if (Emu.IsPaused()) Emu.Resume();
+	else if (Emu.IsRunning()) Emu.Pause();
+	else if (!Emu.GetPath().empty()) Emu.Load();
+};
+
+/* An init method is used so that RPCS3App can create the necessary connects before calling init (specifically the stylesheet connect).  
+ * Simplifies logic a bit.
+ */
+void main_window::Init()
 {
 	ui->setupUi(this);

 	guiSettings.reset(new gui_settings());

 	// Load Icons: This needs to happen before any actions or buttons are created
-	icon_play = QIcon(":/Icons/play.png");
-	icon_pause = QIcon(":/Icons/pause.png");
-	icon_stop = QIcon(":/Icons/stop.png");
-	icon_restart = QIcon(":/Icons/restart.png");
+	RepaintToolBarIcons();
 	appIcon = QIcon(":/rpcs3.ico");

 	// add toolbar widgets (crappy Qt designer is not able to)
@@ -87,26 +103,10 @@ main_window::main_window(QWidget *parent) : QMainWindow(parent), m_sys_menu_open
 	setWindowTitle(QString::fromStdString("RPCS3 v" + rpcs3::version.to_string()));
 	!appIcon.isNull() ? setWindowIcon(appIcon) : LOG_WARNING(GENERAL, "AppImage could not be loaded!");

-	QTimer::singleShot(1, [=]() {
-		// Need to have this happen fast, but not now because connects aren't created yet.
-		// So, a tricky balance in terms of time but this works.
-		RequestGlobalStylesheetChange(guiSettings->GetCurrentStylesheetPath()); 
-		ConfigureGuiFromSettings(true);
-	});
+	RequestGlobalStylesheetChange(guiSettings->GetCurrentStylesheetPath());
+	ConfigureGuiFromSettings(true);
 }

-main_window::~main_window()
-{
-}
-
-auto Pause = []()
-{
-	if (Emu.IsReady()) Emu.Run();
-	else if (Emu.IsPaused()) Emu.Resume();
-	else if (Emu.IsRunning()) Emu.Pause();
-	else if (!Emu.GetPath().empty()) Emu.Load();
-};
-
 void main_window::CreateThumbnailToolbar()
 {
 #ifdef _WIN32
@@ -240,6 +240,7 @@ void main_window::BootElf()

 		const std::string serial = Emu.GetTitleID().empty() ? "" : "[" + Emu.GetTitleID() + "] ";
 		AddRecentAction(q_string_pair(qstr(Emu.GetBoot()), qstr(serial + Emu.GetTitle())));
+		gameListFrame->Refresh(true);
 	}
 }

@@ -276,6 +277,7 @@ void main_window::BootGame()

 		const std::string serial = Emu.GetTitleID().empty() ? "" : "[" + Emu.GetTitleID() + "] ";
 		AddRecentAction(q_string_pair(qstr(Emu.GetBoot()), qstr(serial + Emu.GetTitle())));
+		gameListFrame->Refresh(true);
 	}
 }

@@ -612,6 +614,53 @@ void main_window::SaveWindowState()
 	gameListFrame->SaveSettings();
 }

+void main_window::RepaintToolBarIcons()
+{
+	QColor newColor = guiSettings->GetValue(GUI::mw_toolIconColor).value<QColor>();
+
+	icon_play = gui_settings::colorizedIcon(QIcon(":/Icons/play.png"), GUI::mw_tool_icon_color, newColor);
+	icon_pause = gui_settings::colorizedIcon(QIcon(":/Icons/pause.png"), GUI::mw_tool_icon_color, newColor);
+	icon_stop = gui_settings::colorizedIcon(QIcon(":/Icons/stop.png"), GUI::mw_tool_icon_color, newColor);
+	icon_restart = gui_settings::colorizedIcon(QIcon(":/Icons/restart.png"), GUI::mw_tool_icon_color, newColor);
+	icon_fullscreen_on = gui_settings::colorizedIcon(QIcon(":/Icons/fullscreen.png"), GUI::mw_tool_icon_color, newColor);
+	icon_fullscreen_off = gui_settings::colorizedIcon(QIcon(":/Icons/fullscreen_invert.png"), GUI::mw_tool_icon_color, newColor);
+
+	ui->toolbar_config->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/configure.png"), GUI::mw_tool_icon_color, newColor));
+	ui->toolbar_controls->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/controllers.png"), GUI::mw_tool_icon_color, newColor));
+	ui->toolbar_disc->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/disc.png"), GUI::mw_tool_icon_color, newColor));
+	ui->toolbar_grid->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/grid.png"), GUI::mw_tool_icon_color, newColor));
+	ui->toolbar_list->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/list.png"), GUI::mw_tool_icon_color, newColor));
+	ui->toolbar_refresh->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/refresh.png"), GUI::mw_tool_icon_color, newColor));
+	ui->toolbar_snap->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/screenshot.png"), GUI::mw_tool_icon_color, newColor));
+	ui->toolbar_sort->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/sort.png"), GUI::mw_tool_icon_color, newColor));
+	ui->toolbar_stop->setIcon(gui_settings::colorizedIcon(QIcon(":/Icons/stop.png"), GUI::mw_tool_icon_color, newColor));
+	
+	if (Emu.IsRunning())
+	{
+		ui->toolbar_start->setIcon(icon_pause);
+	}
+	else if (Emu.IsStopped() && !Emu.GetPath().empty())
+	{
+		ui->toolbar_start->setIcon(icon_restart);
+	}
+	else
+	{
+		ui->toolbar_start->setIcon(icon_play);
+	}
+	
+	if (isFullScreen())
+	{
+		ui->toolbar_fullscreen->setIcon(icon_fullscreen_on);
+	}
+	else
+	{
+		ui->toolbar_fullscreen->setIcon(icon_fullscreen_off);
+	}
+
+	ui->sizeSlider->setStyleSheet(QString("QSlider::handle:horizontal{ background: rgba(%1, %2, %3, %4); }")
+		.arg(newColor.red()).arg(newColor.green()).arg(newColor.blue()).arg(newColor.alpha()));
+}
+
 void main_window::OnEmuRun()
 {
 	debuggerFrame->EnableButtons(true);
@@ -791,6 +840,7 @@ void main_window::BootRecentAction(const QAction* act)
 	{
 		LOG_SUCCESS(LOADER, "Boot from Recent List: done");
 		AddRecentAction(q_string_pair(qstr(Emu.GetBoot()), nam));
+		gameListFrame->Refresh(true);
 	}
 };

@@ -971,6 +1021,8 @@ void main_window::CreateConnects()
 		connect(&dlg, &settings_dialog::GuiSettingsSaveRequest, this, &main_window::SaveWindowState);
 		connect(&dlg, &settings_dialog::GuiSettingsSyncRequest, [=]() {ConfigureGuiFromSettings(true); });
 		connect(&dlg, &settings_dialog::GuiStylesheetRequest, this, &main_window::RequestGlobalStylesheetChange);
+		connect(&dlg, &settings_dialog::ToolBarRepaintRequest, this, &main_window::RepaintToolBarIcons);
+		connect(&dlg, &settings_dialog::ToolBarRepaintRequest, gameListFrame, &game_list_frame::RepaintToolBarIcons);
 		connect(&dlg, &settings_dialog::accepted, [this](){
 			gameListFrame->LoadSettings();
 			QColor tbc = guiSettings->GetValue(GUI::mw_toolBarColor).value<QColor>();
@@ -1123,12 +1175,12 @@ void main_window::CreateConnects()
 		if (isFullScreen())
 		{
 			showNormal();
-			ui->toolbar_fullscreen->setIcon(QIcon(":/Icons/fullscreen.png"));
+			ui->toolbar_fullscreen->setIcon(icon_fullscreen_on);
 		}
 		else
 		{
 			showFullScreen();
-			ui->toolbar_fullscreen->setIcon(QIcon(":/Icons/fullscreen_invert.png"));
+			ui->toolbar_fullscreen->setIcon(icon_fullscreen_off);
 		}
 	});
 	connect(ui->toolbar_controls, &QAction::triggered, [=]() { pad_settings_dialog dlg(this); dlg.exec(); });
@@ -1307,7 +1359,7 @@ void main_window::mouseDoubleClickEvent(QMouseEvent *event)
 		if (event->button() == Qt::LeftButton)
 		{
 			showNormal();
-			ui->toolbar_fullscreen->setIcon(QIcon(":/Icons/fullscreen.png"));
+			ui->toolbar_fullscreen->setIcon(icon_fullscreen_on);
 		}
 	}
 }
@@ -37,6 +37,8 @@ class main_window : public QMainWindow
 	QIcon icon_pause;
 	QIcon icon_stop;
 	QIcon icon_restart;
+	QIcon icon_fullscreen_on;
+	QIcon icon_fullscreen_off;

 #ifdef _WIN32
 	QIcon icon_thumb_play;
@@ -55,6 +57,7 @@ class main_window : public QMainWindow

 public:
 	explicit main_window(QWidget *parent = 0);
+	void Init();
 	~main_window();
 	void CreateThumbnailToolbar();
 	QIcon GetAppIcon();
@@ -77,6 +80,7 @@ private Q_SLOTS:
 	void DecryptSPRXLibraries();

 	void SaveWindowState();
+	void RepaintToolBarIcons();

 protected:
 	void closeEvent(QCloseEvent *event) override;
@@ -87,6 +91,7 @@ private:
 	void CreateDockWindows();
 	void ConfigureGuiFromSettings(bool configureAll = false);
 	void EnableMenus(bool enabled);
+
 	void keyPressEvent(QKeyEvent *keyEvent);
 	void mouseDoubleClickEvent(QMouseEvent *event);

@@ -128,12 +128,6 @@ margin-left:14px;</string>
       <property name="autoFillBackground">
        <bool>false</bool>
       </property>
-       <property name="styleSheet">
-        <string notr="true">QSlider::handle:horizontal {
-	background: #404040;
-}
-</string>
-       </property>
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
@@ -434,7 +428,7 @@ QLineEdit { background-color: rgba(227, 227, 227, 255); }</string>
  </action>
  <action name="confPadAct">
   <property name="text">
-    <string>Controls</string>
+    <string>Keyboard</string>
   </property>
   <property name="toolTip">
    <string>Configure Controls</string>
@@ -816,10 +810,10 @@ QLineEdit { background-color: rgba(227, 227, 227, 255); }</string>
     <normaloff>:/Icons/controls.png</normaloff>:/Icons/controls.png</iconset>
   </property>
   <property name="text">
-    <string>controls</string>
+    <string>Keyboard</string>
   </property>
   <property name="toolTip">
-    <string>Configure controls</string>
+    <string>Configure keyboard</string>
   </property>
  </action>
  <action name="toolbar_snap">
@@ -11,7 +11,7 @@
   </rect>
  </property>
  <property name="windowTitle">
-   <string>Configure Controls</string>
+   <string>Configure keyboard</string>
  </property>
  <property name="windowIcon">
   <iconset resource="../resources.qrc">
@@ -10,7 +10,6 @@
 #include <QColorDialog>

 #include "settings_dialog.h"
-#include "emu_settings.h"

 #include "ui_settings_dialog.h"

@@ -81,6 +80,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 		}
 		std::vector<std::string> selected_ls = std::vector<std::string>(selectedlle.begin(), selectedlle.end());
 		xemu_settings->SaveSelectedLibraries(selected_ls);
+		ToolBarRepaintRequest();
 	});
 	connect(ui->okButton, &QAbstractButton::clicked, xemu_settings.get(), &emu_settings::SaveSettings);
 	connect(ui->okButton, &QAbstractButton::clicked, this, &QDialog::accept);
@@ -583,10 +583,8 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 	xemu_settings->EnhanceComboBox(ui->cameraTypeBox, emu_settings::CameraType);
 	ui->cameraTypeBox->setToolTip(json_input["cameraTypeBox"].toString());

-	// Checkboxes
-
-	xemu_settings->EnhanceCheckBox(ui->useFakeCamera, emu_settings::Camera);
-	ui->useFakeCamera->setToolTip(json_input["useFakeCamera"].toString());
+	xemu_settings->EnhanceComboBox(ui->cameraBox, emu_settings::Camera);
+	ui->cameraBox->setToolTip(json_input["cameraBox"].toString());

 	//     _____           _                   _______    _     
 	//    / ____|         | |                 |__   __|  | |    
@@ -685,8 +683,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 		connect(ui->pb_apply_stylesheet, &QAbstractButton::clicked, this, &settings_dialog::OnApplyStylesheet);
 		connect(ui->pb_open_folder, &QAbstractButton::clicked, [=]() {QDesktopServices::openUrl(xgui_settings->GetSettingsDir()); });
 		connect(ui->cb_show_welcome, &QCheckBox::clicked, [=](bool val) {xgui_settings->SetValue(GUI::ib_show_welcome, val); });
-		auto colorDialog = [&](const GUI_SAVE& color, const QString& title){
-			QColorDialog dlg(xgui_settings->GetValue(color).value<QColor>(), this);
+		auto colorDialog = [&](const GUI_SAVE& color, const QString& title, QPushButton *button){
+			QColor oldColor = xgui_settings->GetValue(color).value<QColor>();
+			QColorDialog dlg(oldColor, this);
 			dlg.setWindowTitle(title);
 			dlg.setOptions(QColorDialog::ShowAlphaChannel);
 			for (int i = 0; i < dlg.customCount(); i++)
@@ -700,10 +699,39 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> xSettings, const
 					xgui_settings->SetCustomColor(i, dlg.customColor(i));
 				}
 				xgui_settings->SetValue(color, dlg.selectedColor());
+				button->setIcon(gui_settings::colorizedIcon(button->icon(), oldColor, dlg.selectedColor(), true));
 			}
 		};
-		connect(ui->pb_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::gl_iconColor, "Choose icon color"); });
-		connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolBarColor, "Choose tool bar color"); });
+		connect(ui->pb_gl_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::gl_iconColor, tr("Choose gamelist icon color"), ui->pb_gl_icon_color); });
+		connect(ui->pb_gl_tool_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::gl_toolIconColor, tr("Choose gamelist tool icon color"), ui->pb_gl_tool_icon_color); });
+		connect(ui->pb_tool_bar_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolBarColor, tr("Choose tool bar color"), ui->pb_tool_bar_color); });
+		connect(ui->pb_tool_icon_color, &QAbstractButton::clicked, [=]() { colorDialog(GUI::mw_toolIconColor, tr("Choose tool icon color"), ui->pb_tool_icon_color); });
+
+		// colorize preview icons
+		auto addColoredIcon = [&](QPushButton *button, const QColor& color, const QIcon& icon = QIcon(), const QColor& iconColor = QColor()){
+			QLabel* text = new QLabel(button->text());
+			text->setAlignment(Qt::AlignCenter);
+			text->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+			if (icon.isNull())
+			{
+				QPixmap pixmap(100, 100);
+				pixmap.fill(color);
+				button->setIcon(pixmap);
+			}
+			else
+			{
+				button->setIcon(gui_settings::colorizedIcon(icon, iconColor, color));
+			}
+			button->setText("");
+			button->setStyleSheet("text-align:left;");
+			button->setLayout(new QGridLayout);
+			button->layout()->setContentsMargins(0, 0, 0, 0);
+			button->layout()->addWidget(text);
+		};
+		addColoredIcon(ui->pb_gl_icon_color, xgui_settings->GetValue(GUI::gl_iconColor).value<QColor>());
+		addColoredIcon(ui->pb_tool_bar_color, xgui_settings->GetValue(GUI::mw_toolBarColor).value<QColor>());
+		addColoredIcon(ui->pb_gl_tool_icon_color, xgui_settings->GetValue(GUI::gl_toolIconColor).value<QColor>(), QIcon(":/Icons/home_blue.png"), GUI::gl_tool_icon_color);
+		addColoredIcon(ui->pb_tool_icon_color, xgui_settings->GetValue(GUI::mw_toolIconColor).value<QColor>(), QIcon(":/Icons/stop.png"), GUI::mw_tool_icon_color);

 		AddConfigs();
 		AddStylesheets();
@@ -24,6 +24,7 @@ Q_SIGNALS:
 	void GuiSettingsSyncRequest();
 	void GuiStylesheetRequest(const QString& path);
 	void GuiSettingsSaveRequest();
+	void ToolBarRepaintRequest();
 private Q_SLOTS:
 	void OnBackupCurrentConfig();
 	void OnApplyConfig();
@@ -36,7 +36,7 @@
      </sizepolicy>
     </property>
     <property name="currentIndex">
-      <number>0</number>
+      <number>6</number>
     </property>
     <widget class="QWidget" name="coreTab">
      <attribute name="title">
@@ -774,11 +774,7 @@
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_31">
            <item>
-             <widget class="QCheckBox" name="useFakeCamera">
-              <property name="text">
-               <string>Use Fake Camera</string>
-              </property>
-             </widget>
+             <widget class="QComboBox" name="cameraBox"/>
            </item>
           </layout>
          </widget>
@@ -1167,12 +1163,26 @@
             </widget>
            </item>
            <item>
-             <widget class="QPushButton" name="pb_icon_color">
+             <widget class="QPushButton" name="pb_tool_icon_color">
+              <property name="text">
+               <string>Main window tool icons</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pb_gl_icon_color">
              <property name="text">
               <string>Gamelist icons</string>
              </property>
             </widget>
            </item>
+            <item>
+             <widget class="QPushButton" name="pb_gl_tool_icon_color">
+              <property name="text">
+               <string>Gamelist tool icons</string>
+              </property>
+             </widget>
+            </item>
           </layout>
          </widget>
         </item>
@@ -1261,7 +1271,7 @@
 </resources>
 <connections/>
 <buttongroups>
-  <buttongroup name="ppuBG"/>
  <buttongroup name="spuBG"/>
+  <buttongroup name="ppuBG"/>
 </buttongroups>
 </ui>
@@ -10,7 +10,7 @@
    <Lib>
      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug - LLVM'">..\llvm_build\Debug\lib</AdditionalLibraryDirectories>
      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release - LLVM'">..\llvm_build\Release\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib</AdditionalDependencies>
+      <AdditionalDependencies>LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib;LLVMBinaryFormat.lib</AdditionalDependencies>
    </Lib>
  </ItemDefinitionGroup>
  <ItemGroup />
Author	SHA1	Message	Date
Zangetsu38	e8238b8455	Fix	2017-07-14 16:57:03 +02:00
Zangetsu38	cbf35ffdb5	Update LLVM 5.0	2017-07-14 16:56:44 +02:00
Zion Nimchuk	f90ddeabd0	Initial LLVM 5 port	2017-07-14 16:51:32 +02:00
Zangetsu38	372b9f9dc2	Update Project to Visual Studio 2017.	2017-07-14 16:51:32 +02:00
Megamouse	a58a63aa72	rename controls to keyboard	2017-07-14 16:51:29 +02:00
Megamouse	4a220aa518	Settings: fix cameraBox	2017-07-14 16:51:29 +02:00
Megamouse	c3a7eac375	settings_dialog: add icon hints to color buttons	2017-07-14 16:51:29 +02:00
Megamouse	82c31a9f73	move colorizedIcon to gui_settings	2017-07-14 16:51:29 +02:00
Megamouse	c530e3cf3d	Icons (blue): fix inconsistent colors	2017-07-14 16:51:29 +02:00
Megamouse	8e6fe717ab	game_list_frame: repaint tool icons	2017-07-14 16:51:29 +02:00
Megamouse	d9350149e2	gui_settings: add gamelist tool icon color	2017-07-14 16:51:29 +02:00
Megamouse	918a277e62	settings_dialog: add color picker for gamelist tool icons	2017-07-14 16:51:29 +02:00
Megamouse	7a01b2ccb1	main_window: repaint tool icons	2017-07-14 16:51:29 +02:00
Megamouse	b0742e08d9	settings_dialog: add color picker for main window tool icons	2017-07-14 16:51:29 +02:00
Megamouse	9d635139ed	gui_settings: add tool icon color	2017-07-14 16:51:29 +02:00
Megamouse	788469a66e	game_list_frame: add method colorizedIcons	2017-07-14 16:51:29 +02:00
Robbie	f2df1da3a1	Murdering a wx zombie	2017-07-14 16:51:29 +02:00
Robbie	a4fec2de6f	For the Neko	2017-07-14 16:51:29 +02:00
Robbie	56a0a3a608	Small main_window refactoring. Fixed one of the guiconfig crashes too somehow.	2017-07-14 16:51:29 +02:00
Talkashie	6060c6a342	Fix various typos and capitalisation inconsistencies. also Jarves please implement sysutils	2017-07-14 16:51:29 +02:00
Nekotekina	29453f6d16	Rearrange /dev_bdvd mounting logic Prevent booting patches without /dev_bdvd Prevent booting with foreign /dev_bdvd	2017-07-14 16:51:29 +02:00
Nekotekina	65642c28c6	Improved sprx boot (for devs only)	2017-07-14 16:51:29 +02:00
Nekotekina	0ada09bfd3	Fix cmdline start	2017-07-14 16:51:29 +02:00
scribam	d49ee7886c	Add sceNp2* functions	2017-07-14 16:51:29 +02:00
scribam	f4f4f16cdc	Add sceNp* functions	2017-07-14 16:51:29 +02:00
scribam	c1830965f5	Add cellHttp* functions	2017-07-14 16:51:29 +02:00
scribam	4f14116a04	Remove "#pragma once" directive in a cpp file	2017-07-14 16:51:29 +02:00
Jake	d85dee5be4	fix video playback	2017-07-13 12:24:57 -05:00
Jake	c2d9a0e512	Throw on memory loc until i find something that uses	2017-07-13 12:24:57 -05:00
Jake	db9b2055ce	Move vblank to 'custom' package_id, move fps limit sleep, fix dx12 0 size fb crash	2017-07-13 12:24:57 -05:00
Jake	acfae4a34e	tiles, sync, bufferId, flipReset	2017-07-13 12:24:57 -05:00
Jake	e80afa2b77	gcm: Fix bufferId, sysutil: add refreshrate	2017-07-13 12:24:57 -05:00
Jake	357decdfdc	add to auto lle	2017-07-13 12:24:57 -05:00
Jake	c958715a19	fix thread	2017-07-13 12:24:57 -05:00
Jake	9aba3e21fd	dma main fix	2017-07-13 12:24:57 -05:00
Jake	52664cc501	fix labels	2017-07-13 12:24:57 -05:00
Jake	a13c875e75	stuff	2017-07-13 12:24:57 -05:00
Jake	c47fb72015	Rebase and cleanup, removed irrelevant code, lv2 lle gcm for now	2017-07-13 12:24:57 -05:00