From 35b7cf4c98e9966ecf4d174af2b9dbfba72d7009 Mon Sep 17 00:00:00 2001 From: Ani Date: Mon, 30 Jan 2017 22:16:47 +0000 Subject: [PATCH] Misc changes (#2309) AppVeyor: Improve artifact name Travis: Update notification email README: Fix forum link and remove coveralls sceNp2: Use UNIMPLEMENTED_FUNC macro instead of fmt::throw_exception VK: Fix pathing for linux AboutDialog: Fix forum link --- .travis.yml | 2 +- README.md | 3 +- appveyor.yml | 18 +-- rpcs3/Emu/Cell/Modules/sceNp2.cpp | 189 ++++++++++++++++++++---------- rpcs3/Emu/RSX/VK/VKGSRender.h | 4 +- rpcs3/Gui/AboutDialog.h | 4 +- 6 files changed, 143 insertions(+), 77 deletions(-) diff --git a/.travis.yml b/.travis.yml index f25a7e161e..be915bd581 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,7 +82,7 @@ addons: project: name: $TRAVIS_REPO_SLUG description: "PS3 emulator/debugger" - notification_email: raul.tambre@gmail.com + notification_email: nekotekina@gmail.com build_command: "make -j 4" branch_pattern: coverity_scan diff --git a/README.md b/README.md index 7d83bc1c40..8ffb7bf110 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,10 @@ RPCS3 [![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3) [![Build status](https://ci.appveyor.com/api/projects/status/411c4clmiohtx7eo/branch/master?svg=true)](https://ci.appveyor.com/project/rpcs3/rpcs3/branch/master) [![Coverity Status](https://img.shields.io/coverity/scan/3960.svg)](https://scan.coverity.com/projects/3960) -[![Coverage Status](https://coveralls.io/repos/RPCS3/rpcs3/badge.svg)](https://coveralls.io/r/RPCS3/rpcs3) An open-source PlayStation 3 emulator/debugger written in C++. -You can find some basic information in the [FAQ](https://github.com/RPCS3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=162). +You can find some basic information in the [FAQ](https://github.com/RPCS3/rpcs3/wiki/FAQ). For discussion about this emulator and PS3 emulation please visit the [official forums](http://www.emunewz.net/forum/forumdisplay.php?fid=172). Official Discord server: https://discord.me/RPCS3 diff --git a/appveyor.yml b/appveyor.yml index 3f5425411b..5d7681f4ec 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,19 +1,22 @@ -version: 1.0.{build} +version: '0.0.1-{build}' + os: Visual Studio 2015 -configuration: -# - Release - - ReleaseLLVM platform: x64 -clone_folder: c:\rpcs3 +clone_folder: C:\rpcs3 clone_depth: 3 test: off +configuration: +# Release + - ReleaseLLVM + before_build: + - ps: $env:Date="$(git show -s --date=short --format='%ad')" - git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp rsx_program_decompiler 3rdparty/cereal - 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null - 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/) + - 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/share/llvm/cmake -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON) build_script: @@ -31,4 +34,5 @@ install: artifacts: - path: bin - name: rpcs3-$(configuration)-$(COMMIT_SHA) + name: 'rpcs3-v0.0.1-$(Date)-$(COMMIT_SHA)_win64' + type: zip diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.cpp b/rpcs3/Emu/Cell/Modules/sceNp2.cpp index 70c3256481..5709a92640 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp2.cpp @@ -69,317 +69,380 @@ s32 sceNpMatching2Term2() s32 sceNpMatching2DestroyContext() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2LeaveLobby() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2RegisterLobbyMessageCallback() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetWorldInfoList() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2RegisterLobbyEventCallback() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetLobbyMemberDataInternalList() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SearchRoom() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SignalingGetConnectionStatus() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SetUserInfo() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetClanLobbyId() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetLobbyMemberDataInternal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2ContextStart() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2CreateServerContext() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetMemoryInfo() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2LeaveRoom() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SetRoomDataExternal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SignalingGetConnectionInfo() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SendRoomMessage() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2JoinLobby() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetRoomMemberDataExternalList() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2AbortRequest() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetServerInfo() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetEventData() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetRoomSlotInfoLocal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SendLobbyChatMessage() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2AbortContextStart() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetRoomMemberIdListLocal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2JoinRoom() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetRoomMemberDataInternalLocal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetCbQueueInfo() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2KickoutRoomMember() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2ContextStartAsync() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SetSignalingOptParam() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2RegisterContextCallback() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SendRoomChatMessage() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SetRoomDataInternal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetRoomDataInternal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SignalingGetPingInfo() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetServerIdListLocal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpUtilBuildCdnUrl() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GrantRoomOwner() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2CreateContext() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetSignalingOptParamLocal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2RegisterSignalingCallback() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2ClearEventData() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetUserInfoList() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetRoomMemberDataInternal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SetRoomMemberDataInternal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2JoinProhibitiveRoom() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SignalingSetCtxOpt() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2DeleteServerContext() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SetDefaultRequestOptParam() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2RegisterRoomEventCallback() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetRoomPasswordLocal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetRoomDataExternalList() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2CreateJoinRoom() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SignalingGetCtxOpt() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetLobbyInfoList() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2GetLobbyMemberIdListLocal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SendLobbyInvitation() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2ContextStop() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2SetLobbyMemberDataInternal() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } s32 sceNpMatching2RegisterRoomMessageCallback() { - fmt::throw_exception("Unimplemented" HERE); + UNIMPLEMENTED_FUNC(sceNp2); + return CELL_OK; } diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index 64d5a6ef75..a78cb5bc0c 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -4,9 +4,9 @@ #include "VKTextureCache.h" #include "VKRenderTargets.h" #include "VKFormats.h" -#include "VkTextOut.h" +#include "VKTextOut.h" #include "restore_new.h" -#include "Utilities/optional.hpp" +#include #include "define_new_memleakdetect.h" #define RSX_DEBUG 1 diff --git a/rpcs3/Gui/AboutDialog.h b/rpcs3/Gui/AboutDialog.h index e2d678960e..798f543e4d 100644 --- a/rpcs3/Gui/AboutDialog.h +++ b/rpcs3/Gui/AboutDialog.h @@ -80,8 +80,8 @@ public: switch (event.GetId()) { case b_id_github: wxLaunchDefaultBrowser("https://github.com/RPCS3"); break; - case b_id_website: wxLaunchDefaultBrowser("http://rpcs3.net/"); break; - case b_id_forum: wxLaunchDefaultBrowser("http://www.emunewz.net/forum/forumdisplay.php?fid=162"); break; + case b_id_website: wxLaunchDefaultBrowser("https://rpcs3.net/"); break; + case b_id_forum: wxLaunchDefaultBrowser("http://www.emunewz.net/forum/forumdisplay.php?fid=172"); break; } } };