ci: Try fix Windows Vulkan SDK installation.

.github/workflows/ccpp.yml

@@ -26,12 +26,6 @@ jobs:
     - name: Initialise
       run: mkdir build
 
-    - name: "Fetch full history for vcpkg submodule"
-      run: |
-        cd libraries/vcpkg
-        git fetch --unshallow
-        git pull --all
-
     - name: 'Setup vcpkg'
       run: ./libraries/vcpkg/bootstrap-vcpkg.bat
 
@@ -147,7 +141,7 @@ jobs:
       run: |
         cd build
         wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
-        sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-focal.list http://packages.lunarg.com/vulkan/lunarg-vulkan-focal.list
+        sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-bionic.list http://packages.lunarg.com/vulkan/lunarg-vulkan-bionic.list
         sudo apt-add-repository ppa:cginternals/ppa
         sudo apt-get update
         sudo apt-get install -y cmake ccache vulkan-sdk python3-setuptools mesa-common-dev libglu1-mesa-dev ninja-build libcurl4-openssl-dev libsdl2-dev libssl-dev zlib1g-dev libuv1-dev libc-ares-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev

BUILDING.md

@@ -27,7 +27,7 @@ Use cmake-gui to generate a VS project file:
 - Ensure `Specify the generator for this project` is set to a version of Visual Studio installed on your computer
 - Select `Specify toolchain for cross-compiling`
 - Click `Next`
-- Set `Specify the toolchain file` to `[path to decaf-emu.git]/libraries/vcpkg/scripts/buildsystems/vcpkg.cmake`
+- Set `Specify the toolchain file` to `[path to decaf-emu.git]/libraries/scripts/buildsystems/vcpkg.cmake`
 - Click `Finish`
 - Configure will run, which may take a while as vcpkg acquires the dependencies, if all works the console should say `Configuring done`
 - Click `Generate`, if all works the console should say `Generating done`

CMakeLists.txt

@@ -85,12 +85,12 @@ if(VCPKG_TARGET_TRIPLET)
     find_package(CURL CONFIG REQUIRED)
     find_package(OpenSSL REQUIRED)
     find_package(SDL2 CONFIG REQUIRED)
-    find_package(libuv CONFIG REQUIRED)
+    find_package(unofficial-libuv CONFIG REQUIRED)
     find_package(ZLIB REQUIRED)
 
     set(CARES_LIBRARY c-ares::cares)
     set(CURL_LIBRARY CURL::libcurl)
-    set(LIBUV_LIBRARY libuv::uv)
+    set(LIBUV_LIBRARY unofficial::libuv::libuv)
     set(OPENSSL_LIBRARY OpenSSL::SSL)
     set(SDL2_LIBRARY SDL2::SDL2)
     set(SDL2_MAIN_LIBRARY SDL2::SDL2main)

src/libdecaf/src/ios/kernel/ios_kernel_heap.cpp

@@ -438,22 +438,12 @@ IOS_HeapRealloc(HeapId heapId,
       return nullptr;
    }
 
-   // Allocate a new block if ptr is null
-   if (!ptr) {
-      return IOS_HeapAllocAligned(heapId, size, HeapAllocAlignAlign);
-   }
-
    if (!heapContainsPtr(heap, ptr)) {
       heap->errorCountExpandInvalidBlock++;
       return nullptr;
    }
 
    auto block = phys_cast<HeapBlock *>(phys_cast<uint8_t *>(ptr) - sizeof(HeapBlock));
-   if (block->state != HeapBlockState::Allocated && block->state != HeapBlockState::InnerBlock) {
-      heap->errorCountExpandInvalidBlock++;
-      return nullptr;
-   }
-
    auto blockSize = block->size;
    size = align_up(size, HeapAllocSizeAlign);
 

src/libgpu/src/vulkan/vulkan_driver.h

@@ -30,7 +30,9 @@
 
 // Evaluate f and if result is not a success throw proper vk exception.
 #define CHECK_VK_RESULT(x) do { \
-   vk::resultCheck(static_cast<vk::Result>(x), __FILE__ ":" TOSTRING(__LINE__)); \
+   vk::Result res = vk::Result(x); \
+   int tmp = 0; \
+   vk::createResultValue(res, tmp, __FILE__ ":" TOSTRING(__LINE__)); \
 } while (0)
 
 namespace vulkan

vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "decaf-emu",
-  "version-string": "0.2.0",
-  "builtin-baseline": "06c79a9afa6f99f02f44d20df9e0848b2a56bf1b",
+  "version-string": "0.1.0",
   "dependencies": [
     {
       "name": "ffmpeg",