Fix dynarmic submodule
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -4,3 +4,6 @@
|
||||
[submodule "third_party/elfio"]
|
||||
path = third_party/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
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace Log {
|
||||
static Logger<false> kernelLogger;
|
||||
static Logger<true> debugStringLogger; // Enables output for the outputDebugString SVC
|
||||
static Logger<false> svcLogger;
|
||||
static Logger<false> gpuLogger;
|
||||
static Logger<true> gpuLogger;
|
||||
|
||||
// Service loggers
|
||||
static Logger<false> aptLogger;
|
||||
|
||||
@@ -108,6 +108,11 @@ void GPU::writeInternalReg(u32 index, u32 value, u32 mask) {
|
||||
shaderUnit.vs.uploadIntUniform(index - VertexIntUniform0, value);
|
||||
break;
|
||||
|
||||
case VertexShaderData0: case VertexShaderData1: case VertexShaderData2: case VertexShaderData3:
|
||||
case VertexShaderData4: case VertexShaderData5: case VertexShaderData6: case VertexShaderData7:
|
||||
shaderUnit.vs.uploadWord(value);
|
||||
break;
|
||||
|
||||
case VertexShaderTransferEnd:
|
||||
if (value != 0) shaderUnit.vs.finalize();
|
||||
break;
|
||||
@@ -116,11 +121,6 @@ void GPU::writeInternalReg(u32 index, u32 value, u32 mask) {
|
||||
shaderUnit.vs.setBufferIndex(value);
|
||||
break;
|
||||
|
||||
case VertexShaderData0: case VertexShaderData1: case VertexShaderData2: case VertexShaderData3:
|
||||
case VertexShaderData4: case VertexShaderData5: case VertexShaderData6: case VertexShaderData7:
|
||||
shaderUnit.vs.uploadWord(value);
|
||||
break;
|
||||
|
||||
default:
|
||||
// Vertex attribute registers
|
||||
if (index >= AttribInfoStart && index <= AttribInfoEnd) {
|
||||
|
||||
@@ -9,7 +9,7 @@ int main (int argc, char *argv[]) {
|
||||
|
||||
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)) {
|
||||
// For some reason just .c_str() doesn't show the proper path
|
||||
Helpers::panic("Failed to load ELF file: %s", elfPath.string().c_str());
|
||||
|
||||
1
third_party/dynarmic
vendored
Submodule
1
third_party/dynarmic
vendored
Submodule
Submodule third_party/dynarmic added at af51845a53
Reference in New Issue
Block a user