Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-10-07 19:03:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16296 from unknownbrackets/warnings

Browse Source 
Correct some warnings
This commit is contained in:
Henrik Rydgård 2022-10-29 21:34:42 +02:00 committed by GitHub
commit 15e9540852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 114 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Common/GPU/Vulkan/VulkanQueueRunner.cpp
View File

@ -1145,6 +1145,9 @@ void VulkanQueueRunner::LogRenderPass(const VKRStep &pass, bool verbose) {
case VKRRenderCommand::DEBUG_ANNOTATION:
INFO_LOG(G3D, " DebugAnnotation(%s)", cmd.debugAnnotation.annotation);
break;
case VKRRenderCommand::BIND_DESCRIPTOR_SET:
INFO_LOG(G3D, " BindDescSet(%d)", cmd.bindDescSet.setNumber);
break;
case VKRRenderCommand::NUM_RENDER_COMMANDS:
break;

12
UWP/Armips_UWP/Armips_UWP.vcxproj
View File

@ -278,6 +278,12 @@
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsOpcodes.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\MipsParser.h" />
<ClInclude Include="..\..\ext\armips\Archs\MIPS\PsxRelocator.h" />
<ClInclude Include="..\..\ext\armips\Archs\SuperH\CShInstruction.h" />
<ClInclude Include="..\..\ext\armips\Archs\SuperH\ShElfRelocator.h" />
<ClInclude Include="..\..\ext\armips\Archs\SuperH\ShExpressionFunctions.h" />
<ClInclude Include="..\..\ext\armips\Archs\SuperH\ShOpcodes.h" />
<ClInclude Include="..\..\ext\armips\Archs\SuperH\ShParser.h" />
<ClInclude Include="..\..\ext\armips\Archs\SuperH\SuperH.h" />
<ClInclude Include="..\..\ext\armips\Commands\CAssemblerCommand.h" />
<ClInclude Include="..\..\ext\armips\Commands\CAssemblerLabel.h" />
<ClInclude Include="..\..\ext\armips\Commands\CDirectiveArea.h" />
@ -329,6 +335,12 @@
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsOpcodes.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\MipsParser.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\MIPS\PsxRelocator.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\SuperH\CShInstruction.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\SuperH\ShElfRelocator.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\SuperH\ShExpressionFunctions.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\SuperH\ShOpcodes.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\SuperH\ShParser.cpp" />
<ClCompile Include="..\..\ext\armips\Archs\SuperH\SuperH.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CAssemblerCommand.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CAssemblerLabel.cpp" />
<ClCompile Include="..\..\ext\armips\Commands\CDirectiveArea.cpp" />

39
UWP/Armips_UWP/Armips_UWP.vcxproj.filters
View File

@ -56,6 +56,24 @@
<ClCompile Include="..\..\ext\armips\Archs\MIPS\PsxRelocator.cpp">
<Filter>Archs\MIPS</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\SuperH\ShOpcodes.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\SuperH\ShParser.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\SuperH\SuperH.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\SuperH\CShInstruction.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\SuperH\ShElfRelocator.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\SuperH\ShExpressionFunctions.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="..\..\ext\armips\Archs\Architecture.cpp">
<Filter>Archs</Filter>
</ClCompile>
@ -202,6 +220,24 @@
<ClInclude Include="..\..\ext\armips\Archs\MIPS\PsxRelocator.h">
<Filter>Archs\MIPS</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\SuperH\ShExpressionFunctions.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\SuperH\ShOpcodes.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\SuperH\ShParser.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\SuperH\SuperH.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\SuperH\CShInstruction.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\SuperH\ShElfRelocator.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="..\..\ext\armips\Archs\Architecture.h">
<Filter>Archs</Filter>
</ClInclude>
@ -300,6 +336,9 @@
<Filter Include="Archs\MIPS">
<UniqueIdentifier>{bef7b4a2-b049-4d00-810c-6d8d6605c2a3}</UniqueIdentifier>
</Filter>
<Filter Include="Archs\SuperH">
<UniqueIdentifier>{bef7b4a2-b049-4d00-810c-6d8d6605c2a4}</UniqueIdentifier>
</Filter>
<Filter Include="Core">
<UniqueIdentifier>{2ce1016b-f93c-48b9-abe5-d3fbbcd24780}</UniqueIdentifier>
</Filter>

6
android/jni/Android.mk
View File

@ -584,6 +584,12 @@ LIBARMIPS_FILES := \
$(SRC)/ext/armips/Archs/MIPS/MipsOpcodes.cpp \
$(SRC)/ext/armips/Archs/MIPS/MipsParser.cpp \
$(SRC)/ext/armips/Archs/MIPS/PsxRelocator.cpp \
$(SRC)/ext/armips/Archs/SuperH/CShInstruction.cpp \
$(SRC)/ext/armips/Archs/SuperH/ShElfRelocator.cpp \
$(SRC)/ext/armips/Archs/SuperH/ShExpressionFunctions.cpp \
$(SRC)/ext/armips/Archs/SuperH/ShOpcodes.cpp \
$(SRC)/ext/armips/Archs/SuperH/ShParser.cpp \
$(SRC)/ext/armips/Archs/SuperH/SuperH.cpp \
$(SRC)/ext/armips/Archs/Architecture.cpp \
$(SRC)/ext/armips/Commands/CAssemblerCommand.cpp \
$(SRC)/ext/armips/Commands/CAssemblerLabel.cpp \

2
ext/armips

@ -1 +1 @@
Subproject commit b4335f04fa62c1b4f7833c70fbb15505b6772274
Subproject commit 6719edebaae03330ee5441d9b28280672edf00d5

12
ext/libarmips.vcxproj
View File

@ -502,6 +502,12 @@
<ClCompile Include="armips\Archs\MIPS\MipsOpcodes.cpp" />
<ClCompile Include="armips\Archs\MIPS\MipsParser.cpp" />
<ClCompile Include="armips\Archs\MIPS\PsxRelocator.cpp" />
<ClCompile Include="armips\Archs\SuperH\CShInstruction.cpp" />
<ClCompile Include="armips\Archs\SuperH\ShElfRelocator.cpp" />
<ClCompile Include="armips\Archs\SuperH\ShExpressionFunctions.cpp" />
<ClCompile Include="armips\Archs\SuperH\ShOpcodes.cpp" />
<ClCompile Include="armips\Archs\SuperH\ShParser.cpp" />
<ClCompile Include="armips\Archs\SuperH\SuperH.cpp" />
<ClCompile Include="armips\Commands\CAssemblerCommand.cpp" />
<ClCompile Include="armips\Commands\CAssemblerLabel.cpp" />
<ClCompile Include="armips\Commands\CDirectiveArea.cpp" />
@ -554,6 +560,12 @@
<ClInclude Include="armips\Archs\MIPS\MipsOpcodes.h" />
<ClInclude Include="armips\Archs\MIPS\MipsParser.h" />
<ClInclude Include="armips\Archs\MIPS\PsxRelocator.h" />
<ClInclude Include="armips\Archs\SuperH\CShInstruction.h" />
<ClInclude Include="armips\Archs\SuperH\ShElfRelocator.h" />
<ClInclude Include="armips\Archs\SuperH\ShExpressionFunctions.h" />
<ClInclude Include="armips\Archs\SuperH\ShOpcodes.h" />
<ClInclude Include="armips\Archs\SuperH\ShParser.h" />
<ClInclude Include="armips\Archs\SuperH\SuperH.h" />
<ClInclude Include="armips\Commands\CAssemblerCommand.h" />
<ClInclude Include="armips\Commands\CAssemblerLabel.h" />
<ClInclude Include="armips\Commands\CDirectiveArea.h" />

39
ext/libarmips.vcxproj.filters
View File

@ -31,6 +31,9 @@
<Filter Include="Parser">
<UniqueIdentifier>{d1037c70-bb54-46fc-8b0c-a47c4ea4a252}</UniqueIdentifier>
</Filter>
<Filter Include="Archs\SuperH">
<UniqueIdentifier>{496988ff-1b2f-4046-bc02-b5ad9a1952b4}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="armips\Archs\Architecture.cpp">
@ -183,6 +186,24 @@
<ClCompile Include="armips\Core\ExpressionFunctionHandler.cpp">
<Filter>Core</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\SuperH\ShOpcodes.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\SuperH\ShParser.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\SuperH\SuperH.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\SuperH\CShInstruction.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\SuperH\ShElfRelocator.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
<ClCompile Include="armips\Archs\SuperH\ShExpressionFunctions.cpp">
<Filter>Archs\SuperH</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="armips\Archs\Architecture.h">
@ -341,5 +362,23 @@
<ClInclude Include="armips\Core\ExpressionFunctionHandler.h">
<Filter>Core</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\SuperH\ShExpressionFunctions.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\SuperH\ShOpcodes.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\SuperH\ShParser.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\SuperH\SuperH.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\SuperH\CShInstruction.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
<ClInclude Include="armips\Archs\SuperH\ShElfRelocator.h">
<Filter>Archs\SuperH</Filter>
</ClInclude>
</ItemGroup>
</Project>

2
pspautotests

@ -1 +1 @@
Subproject commit 1790e574bd069c7e4883bf097db46094526b0dc9
Subproject commit a886587cc29ffadc93f5533a0f8dc329ae355b9a

1
test.py
View File

@ -201,6 +201,7 @@ tests_good = [
"intr/suspended",
"intr/vblank/vblank",
"io/cwd/cwd",
"io/open/badparent",
"jpeg/create",
"jpeg/delete",
"jpeg/finish",