Match Renderer's Initialise & SetupMemoryPools and some more (#39)

Author: Bagietas

data/mcswitch_functions.csv

@@ -39371,7 +39371,7 @@ Address,Quality,Size,Name
 0x0000007100607250,U,000468,
 0x0000007100607424,U,001548,
 0x0000007100607a30,U,000004,
-0x0000007100607a34,U,000016,
+0x0000007100607a34,O,000016,_ZNK2nn6Result9IsSuccessEv
 0x0000007100607a44,U,000048,
 0x0000007100607a74,U,000616,
 0x0000007100607cdc,U,000056,
@@ -39763,10 +39763,10 @@ Address,Quality,Size,Name
 0x0000007100618dd0,U,000112,
 0x0000007100618e40,U,000008,
 0x0000007100618e48,U,000100,_ZN13BlockRenderer28tesselateInWorldFixedTextureEPK10BlockStateRK8BlockPosP18TextureAtlasSprite
-0x0000007100618eac,U,001468,_ZN13BlockRenderer16tesselateInWorldEPK10BlockStateRK8BlockPosS2_NSt3__110shared_ptrI11BlockEntityEE
+0x0000007100618eac,M,001468,_ZN13BlockRenderer16tesselateInWorldEPK10BlockStateRK8BlockPosS2_NSt3__110shared_ptrI11BlockEntityEE
 0x0000007100619468,U,000120,
 0x00000071006194e0,U,000020,_ZN13BufferBuilder15setMipmapEnableEb
-0x00000071006194f4,U,000008,
+0x00000071006194f4,O,000008,_ZN5Block15isMipmapEnabledEv
 0x00000071006194fc,U,000336,tesselateBlockInWorld__13BlockRendererFPC10BlockStateRC8BlockPosi
 0x000000710061964c,U,000532,tesselateTrapDoorInWorld__13BlockRendererFPC10BlockStateRC8BlockPos
 0x0000007100619860,U,000120,tesselateSlimeBlockInWorld__13BlockRendererFPC10BlockStateRC8BlockPos
@@ -46196,7 +46196,7 @@ Address,Quality,Size,Name
 0x0000007100794b6c,U,000012,
 0x0000007100794b78,U,000056,_ZN8Renderer14createInstanceEv
 0x0000007100794bb0,U,000004,_GLOBAL__sub_I_RendererCore.cpp
-0x0000007100794bb4,U,000200,_ZN8RendererC1Ev
+0x0000007100794bb4,O,000200,_ZN8RendererC1Ev
 0x0000007100794c7c,U,000020,_ZN9C4JRenderC1Ev
 0x0000007100794c90,U,000008,
 0x0000007100794c98,U,000296,
@@ -46207,24 +46207,24 @@ Address,Quality,Size,Name
 0x00000071007950c4,U,000148,
 0x0000007100795158,U,000012,
 0x0000007100795164,U,000268,
-0x0000007100795270,U,000016,
-0x0000007100795280,U,000016,
-0x0000007100795290,U,000016,
-0x00000071007952a0,U,000016,
-0x00000071007952b0,U,000016,
+0x0000007100795270,O,000016,_ZL27nvnBufferBuilderSetDefaultsP16NVNbufferBuilder
+0x0000007100795280,O,000016,_ZL25nvnBufferBuilderSetDeviceP16NVNbufferBuilderP9NVNdevice
+0x0000007100795290,O,000016,_ZL26nvnBufferBuilderSetStorageP16NVNbufferBuilderP13NVNmemoryPoollm
+0x00000071007952a0,O,000016,_ZL19nvnBufferInitializeP9NVNbufferPK16NVNbufferBuilder
+0x00000071007952b0,O,000016,_ZL12nvnBufferMapPK9NVNbuffer
 0x00000071007952c0,U,000016,
-0x00000071007952d0,U,000016,
+0x00000071007952d0,O,000016,_ZL19nvnBufferGetAddressPK9NVNbuffer
 0x00000071007952e0,U,000016,
 0x00000071007952f0,U,000028,
-0x000000710079530c,U,000744,
-0x00000071007955f4,U,000016,
-0x0000007100795604,U,000792,
+0x000000710079530c,U,000744,_ZN8Renderer11LoadShadersEv
+0x00000071007955f4,O,000016,_ZL19nvnDeviceGetIntegerPK9NVNdevice13NVNdeviceInfoPi
+0x0000007100795604,U,000792,_ZN8Renderer12SetupShadersEv
 0x000000710079591c,U,000016,
 0x000000710079592c,U,000020,
 0x0000007100795940,U,000016,
 0x0000007100795950,U,000040,Renderer::getContext
 0x0000007100795978,U,000048,
-0x00000071007959a8,U,000524,
+0x00000071007959a8,M,000524,_ZN8Renderer7ContextC1EPS_b
 0x0000007100795bb4,U,000004,
 0x0000007100795bb8,U,000016,
 0x0000007100795bc8,U,000016,
@@ -46233,41 +46233,42 @@ Address,Quality,Size,Name
 0x0000007100795c00,U,000016,
 0x0000007100795c10,U,000016,
 0x0000007100795c20,U,000016,
-0x0000007100795c30,U,000008,_ZN8Renderer17InitialiseContextEv
-0x0000007100795c38,U,000072,
-0x0000007100795c80,U,003612,_ZN8Renderer10InitialiseEv
-0x0000007100796a9c,U,000016,
-0x0000007100796aac,U,000004,
-0x0000007100796ab0,U,000004,
-0x0000007100796ab4,U,000016,
-0x0000007100796ac4,U,000020,
-0x0000007100796ad8,U,000016,
-0x0000007100796ae8,U,000020,
-0x0000007100796afc,U,000016,
-0x0000007100796b0c,U,000016,
-0x0000007100796b1c,U,000016,
-0x0000007100796b2c,U,000020,
-0x0000007100796b40,U,000016,
-0x0000007100796b50,U,000016,
-0x0000007100796b60,U,000016,
-0x0000007100796b70,U,000016,
-0x0000007100796b80,U,000016,
-0x0000007100796b90,U,000016,
-0x0000007100796ba0,U,000016,
-0x0000007100796bb0,U,000016,
-0x0000007100796bc0,U,000016,
-0x0000007100796bd0,U,000016,
-0x0000007100796be0,U,000020,
-0x0000007100796bf4,U,000016,
-0x0000007100796c04,U,000016,
-0x0000007100796c14,U,000016,
-0x0000007100796c24,U,000016,
-0x0000007100796c34,U,000016,
-0x0000007100796c44,U,000016,
-0x0000007100796c54,U,000016,
-0x0000007100796c64,U,000016,
-0x0000007100796c74,U,001512,
-0x000000710079725c,U,000040,
+0x0000007100795c30,O,000008,_ZN8Renderer17InitialiseContextEv
+0x0000007100795c38,M,000072,_ZN8Renderer17InitialiseContextEb
+0x0000007100795c80,O,000008,_ZN8Renderer10InitialiseEv
+0x0000007100795c88,O,003604,_ZN8Renderer10InitialiseEb
+0x0000007100796a9c,O,000016,_Z17gfx_aligned_allocmmPv
+0x0000007100796aac,O,000004,_Z8gfx_freePvS_
+0x0000007100796ab0,M,000004,_Z11gfx_reallocPvmS_
+0x0000007100796ab4,O,000016,_ZL27nvnDeviceBuilderSetDefaultsP16NVNdeviceBuilder
+0x0000007100796ac4,O,000020,_ZL24nvnDeviceBuilderSetFlagsP16NVNdeviceBuilderi
+0x0000007100796ad8,O,000016,_ZL19nvnDeviceInitializeP9NVNdevicePK16NVNdeviceBuilder
+0x0000007100796ae8,O,000020,_ZL28nvnDeviceSetWindowOriginModeP9NVNdevice19NVNwindowOriginMode
+0x0000007100796afc,O,000016,_ZL17nvnSyncInitializeP7NVNsyncP9NVNdevice
+0x0000007100796b0c,O,000016,_ZL24nvnQueueBuilderSetDeviceP15NVNqueueBuilderP9NVNdevice
+0x0000007100796b1c,O,000016,_ZL26nvnQueueBuilderSetDefaultsP15NVNqueueBuilder
+0x0000007100796b2c,O,000020,_ZL35nvnQueueBuilderSetComputeMemorySizeP15NVNqueueBuilderm
+0x0000007100796b40,O,000016,_ZL35nvnQueueBuilderSetCommandMemorySizeP15NVNqueueBuilderm
+0x0000007100796b50,O,000016,_ZL39nvnQueueBuilderSetCommandFlushThresholdP15NVNqueueBuilderm
+0x0000007100796b60,O,000016,_ZL33nvnQueueBuilderGetQueueMemorySizePK15NVNqueueBuilder
+0x0000007100796b70,O,000016,_ZL29nvnQueueBuilderSetQueueMemoryP15NVNqueueBuilderPvm
+0x0000007100796b80,O,000016,_ZL18nvnQueueInitializeP8NVNqueuePK15NVNqueueBuilder
+0x0000007100796b90,O,000016,_ZL26nvnCommandBufferInitializeP16NVNcommandBufferP9NVNdevice
+0x0000007100796ba0,O,000016,_ZL26nvnTextureBuilderSetDeviceP17NVNtextureBuilderP9NVNdevice
+0x0000007100796bb0,O,000016,_ZL28nvnTextureBuilderSetDefaultsP17NVNtextureBuilder
+0x0000007100796bc0,O,000016,_ZL25nvnTextureBuilderSetFlagsP17NVNtextureBuilderi
+0x0000007100796bd0,O,000016,_ZL26nvnTextureBuilderSetSize2DP17NVNtextureBuilderii
+0x0000007100796be0,O,000020,_ZL26nvnTextureBuilderSetTargetP17NVNtextureBuilder16NVNtextureTarget
+0x0000007100796bf4,O,000016,_ZL26nvnTextureBuilderSetFormatP17NVNtextureBuilder9NVNformat
+0x0000007100796c04,O,000016,_ZL31nvnTextureBuilderGetStorageSizePK17NVNtextureBuilder
+0x0000007100796c14,O,000016,_ZL36nvnTextureBuilderGetStorageAlignmentPK17NVNtextureBuilder
+0x0000007100796c24,O,000016,_ZL24nvnTexturePoolInitializeP14NVNtexturePoolPK13NVNmemoryPoolli
+0x0000007100796c34,O,000016,_ZL24nvnSamplerPoolInitializeP14NVNsamplerPoolPK13NVNmemoryPoolli
+0x0000007100796c44,O,000016,_ZL27nvnWindowBuilderSetDefaultsP16NVNwindowBuilder
+0x0000007100796c54,O,000016,_ZL25nvnWindowBuilderSetDeviceP16NVNwindowBuilderP9NVNdevice
+0x0000007100796c64,O,000016,_ZL31nvnWindowBuilderSetNativeWindowP16NVNwindowBuilderPv
+0x0000007100796c74,U,001512,_ZN8Renderer14sub_7100796C74Ev
+0x000000710079725c,O,000040,_ZL16nvnWindowSetCropP9NVNwindowiiii
 0x0000007100797284,U,000016,
 0x0000007100797294,U,000016,
 0x00000071007972a4,U,000016,
@@ -46353,15 +46354,15 @@ Address,Quality,Size,Name
 0x0000007100798db0,U,000092,_ZN8Renderer9MatrixGetEi
 0x0000007100798e0c,U,000056,
 0x0000007100798e44,U,000164,_ZN8Renderer15Set_matrixDirtyEv
-0x0000007100798ee8,U,000320,
+0x0000007100798ee8,O,000320,_ZN8Renderer16SetupMemoryPoolsEv
 0x0000007100799028,U,000016,
 0x0000007100799038,U,000016,
 0x0000007100799048,U,000016,
 0x0000007100799058,U,000016,
 0x0000007100799068,U,000016,
-0x0000007100799078,U,000068,
+0x0000007100799078,U,000068,_ZN8Renderer14sub_7100799078Eimm
 0x00000071007990bc,U,000020,
-0x00000071007990d0,U,000024,
+0x00000071007990d0,O,000024,_ZN8Renderer23getNVNMemoryPoolByIndexEj
 0x00000071007990e8,U,000108,
 0x0000007100799154,U,000092,
 0x00000071007991b0,U,000016,
@@ -46920,7 +46921,7 @@ Address,Quality,Size,Name
 0x00000071007b6e88,O,000712,png_do_write_interlace
 0x00000071007b7150,O,003260,png_write_find_filter
 0x00000071007b7e0c,O,000108,png_write_filtered_row
-0x00000071007b7e78,U,000120,
+0x00000071007b7e78,U,000120,_ZN16class_71007B7E78C1Emi
 0x00000071007b7ef0,U,000044,
 0x00000071007b7f1c,U,000148,
 0x00000071007b7fb0,U,000368,
@@ -48351,7 +48352,7 @@ Address,Quality,Size,Name
 0x00000071007eb428,O,000008,zcfree
 0x00000071007eb430,U,000012,Libz_SigloMiddlewareInfo
 0x00000071007eb43c,U,002004,
-0x00000071007ebc10,U,013384,nvnLoadCProcs
+0x00000071007ebc10,O,013384,nvnLoadCProcs
 0x00000071007ef058,U,000068,
 0x00000071007ef09c,U,000024,
 0x00000071007ef0b4,U,000120,

src/Minecraft.Client/platform/NX/Platform.cpp

@@ -48,3 +48,15 @@ void XMemDestroyCompressionContext(void* ctxt) {
 void XMemDestroyDecompressionContext(void* ctxt) {
     return;
 }
+
+void* gfx_aligned_alloc(ulong a1, ulong a2, void*) {
+    return aligned_alloc(a2, a1);
+}
+
+void gfx_free(void* ptr, void*) {
+    free(ptr);
+}
+
+void* gfx_realloc(void* ptr, ulong size, void*) {
+    realloc(ptr, size);
+}

src/Minecraft.Client/platform/NX/Platform.h

@@ -6,6 +6,7 @@ This file contains all of the Switch implementations of Windows/XBOX functions
 
 */
 
+#include <cstdlib>
 #include <nn/os.h>
 
 typedef bool BOOL;
@@ -50,4 +51,8 @@ int TlsSetValue(unsigned int index, void* value);
 
 int OpenDir(const char*, int*);
 int ReadDir(int*, struct FSDirEntry*);  // TODO: what is FSDirEntry?
-int CloseDir(int*);
+int CloseDir(int*);
+
+void* gfx_aligned_alloc(ulong a1, ulong a2, void*);
+void gfx_free(void* ptr, void*);
+void* gfx_realloc(void* ptr, ulong, void*);