Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-07 22:55:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix dynarmic submodule

Browse source
This commit is contained in:
wheremyfoodat 2022-09-26 18:43:37 +03:00
parent 979519f785
commit f9287c1eda
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "third_party/elfio"] [submodule "third_party/elfio"]
path = third_party/elfio path = third_party/elfio
url = https://github.com/serge1/ELFIO url = https://github.com/serge1/ELFIO
[submodule "third_party/dynarmic"]
path = third_party/dynarmic
url = https://github.com/merryhime/dynarmic/tree/master/src/dynarmic

2
include/logger.hpp
View file

@ -21,7 +21,7 @@ namespace Log {
static Logger<false> kernelLogger; static Logger<false> kernelLogger;
static Logger<true> debugStringLogger; // Enables output for the outputDebugString SVC static Logger<true> debugStringLogger; // Enables output for the outputDebugString SVC
static Logger<false> svcLogger; static Logger<false> svcLogger;
static Logger<false> gpuLogger; static Logger<true> gpuLogger;
// Service loggers // Service loggers
static Logger<false> aptLogger; static Logger<false> aptLogger;

10
src/core/PICA/regs.cpp
View file

@ -108,6 +108,11 @@ void GPU::writeInternalReg(u32 index, u32 value, u32 mask) {
shaderUnit.vs.uploadIntUniform(index - VertexIntUniform0, value); shaderUnit.vs.uploadIntUniform(index - VertexIntUniform0, value);
break; break;
case VertexShaderData0: case VertexShaderData1: case VertexShaderData2: case VertexShaderData3:
case VertexShaderData4: case VertexShaderData5: case VertexShaderData6: case VertexShaderData7:
shaderUnit.vs.uploadWord(value);
break;
case VertexShaderTransferEnd: case VertexShaderTransferEnd:
if (value != 0) shaderUnit.vs.finalize(); if (value != 0) shaderUnit.vs.finalize();
break; break;
@ -116,11 +121,6 @@ void GPU::writeInternalReg(u32 index, u32 value, u32 mask) {
shaderUnit.vs.setBufferIndex(value); shaderUnit.vs.setBufferIndex(value);
break; break;
case VertexShaderData0: case VertexShaderData1: case VertexShaderData2: case VertexShaderData3:
case VertexShaderData4: case VertexShaderData5: case VertexShaderData6: case VertexShaderData7:
shaderUnit.vs.uploadWord(value);
break;
default: default:
// Vertex attribute registers // Vertex attribute registers
if (index >= AttribInfoStart && index <= AttribInfoEnd) { if (index >= AttribInfoStart && index <= AttribInfoEnd) {

2
src/main.cpp
View file

@ -9,7 +9,7 @@ int main (int argc, char *argv[]) {
emu.initGraphicsContext(); emu.initGraphicsContext();
auto elfPath = std::filesystem::current_path() / (argc > 1 ? argv[1] : "SimplerTri.elf"); auto elfPath = std::filesystem::current_path() / (argc > 1 ? argv[1] : "sm64.elf");
if (!emu.loadELF(elfPath)) { if (!emu.loadELF(elfPath)) {
// For some reason just .c_str() doesn't show the proper path // For some reason just .c_str() doesn't show the proper path
Helpers::panic("Failed to load ELF file: %s", elfPath.string().c_str()); Helpers::panic("Failed to load ELF file: %s", elfPath.string().c_str());

1
third_party/dynarmic vendored Submodule

@ -0,0 +1 @@
Subproject commit af51845a53108f9bf076efa31eac54573fe432e8