Fixes for GLideN64 rebase.

This commit is contained in:
M4xw 2019-03-25 13:18:38 +01:00
parent 4b2952e42f
commit 222552d520
3 changed files with 18 additions and 6 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ asm_defines_nasm.h
asm_defines_gas.h
.vscode/ipch/*
.vscode/c_cpp_properties.json
linker.list

View File

@ -230,7 +230,7 @@ SOURCES_CXX += \
$(VIDEODIR_GLIDEN64)/src/VI.cpp \
$(VIDEODIR_GLIDEN64)/src/ZlutTexture.cpp \
$(VIDEODIR_GLIDEN64)/src/common/CommonAPIImpl_common.cpp \
$(VIDEODIR_GLIDEN64)/src/NoiseTexture.cpp \
$(VIDEODIR_GLIDEN64)/src/NoiseTexture.cpp \
$(VIDEODIR_GLIDEN64)/src/DepthBufferRender/ClipPolygon.cpp \
$(VIDEODIR_GLIDEN64)/src/DepthBufferRender/DepthBufferRender.cpp \
$(VIDEODIR_GLIDEN64)/src/BufferCopy/ColorBufferToRDRAM.cpp \
@ -261,10 +261,11 @@ SOURCES_CXX += \
$(VIDEODIR_GLIDEN64)/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramImpl.cpp \
$(VIDEODIR_GLIDEN64)/src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramUniformFactory.cpp \
$(VIDEODIR_GLIDEN64)/src/Graphics/OpenGLContext/GLSL/glsl_FXAA.cpp \
$(VIDEODIR_GLIDEN64)/src/mupenplus/MemoryStatus_mupenplus.cpp \
$(VIDEODIR_GLIDEN64)/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.cpp \
$(VIDEODIR_GLIDEN64)/src/Graphics/OpenGLContext/GLSL/glsl_SpecialShadersFactory.cpp \
$(VIDEODIR_GLIDEN64)/src/Graphics/OpenGLContext/GLSL/glsl_Utils.cpp \
$(VIDEODIR_GLIDEN64)/src/Graphics/OpenGLContext/GraphicBuffer/PrivateApi/GraphicBuffer.cpp \
$(VIDEODIR_GLIDEN64)/src/Graphics/OpenGLContext/GraphicBuffer/PrivateApi/GraphicBuffer.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/F3D.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/F3DAM.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/F3DBETA.cpp \
@ -279,7 +280,7 @@ SOURCES_CXX += \
$(VIDEODIR_GLIDEN64)/src/uCodes/F3DPD.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/F3DSETA.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/F5Indi_Naboo.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/F5Rogue.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/F5Rogue.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/F3DTEXA.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/L3D.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/L3DEX2.cpp \
@ -290,9 +291,9 @@ SOURCES_CXX += \
$(VIDEODIR_GLIDEN64)/src/uCodes/Turbo3D.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/ZSort.cpp \
$(VIDEODIR_GLIDEN64)/src/uCodes/ZSortBOSS.cpp \
$(VIDEODIR_GLIDEN64)/src/MupenPlusPluginAPI.cpp \
$(VIDEODIR_GLIDEN64)/src/mupenplus/MupenPlusAPIImpl.cpp \
$(ROOT_DIR)/custom/GLideN64/mupenplus/Config_mupenplus.cpp \
$(VIDEODIR_GLIDEN64)/src/MupenPlusPluginAPI.cpp \
$(VIDEODIR_GLIDEN64)/src/mupenplus/MupenPlusAPIImpl.cpp \
$(ROOT_DIR)/custom/GLideN64/mupenplus/Config_mupenplus.cpp \
$(ROOT_DIR)/custom/GLideN64/mupenplus/CommonAPIImpl_mupenplus.cpp
ifneq (,$(findstring android,$(platform)))
SOURCES_CXX += $(VIDEODIR_GLIDEN64)/src/GLideNHQ/txWidestringWrapper.cpp \

View File

@ -37,6 +37,10 @@ char customini[] =
"Good_Name=Mario Artist Talent Studio (64dd disk)\n"
"frameBufferEmulation\\copyAuxToRDRAM=1\n"
"\n"
"[DONKEY%20KONG%2064]\n"
"Good_Name=Donkey Kong 64 (E)(J)(U)\n"
"frameBufferEmulation\\copyDepthToRDRAM=1\n"
"\n"
"[DR.MARIO%2064]\n"
"Good_Name=Dr. Mario 64 (U)\n"
"frameBufferEmulation\\copyFromRDRAM=1\n"
@ -69,6 +73,9 @@ char customini[] =
"Good_Name=Hexen (E)(F)(G)(J)(U)\n"
"frameBufferEmulation\\copyToRDRAM=1\n"
"\n"
"[HUMAN%20GRAND%20PRIX]\n"
"frameBufferEmulation\\copyToRDRAM=1\n"
"\n"
"[I%20S%20S%2064]\n"
"Good_Name=International Superstar Soccer 64 (E) (U)\n"
"frameBufferEmulation\\N64DepthCompare=1\n"
@ -82,6 +89,9 @@ char customini[] =
"Good_Name=Jet Force Gemini Kiosk Demo (U)\n"
"frameBufferEmulation\\fbInfoDisabled=0\n"
"\n"
"[J%20WORLD%20SOCCER3]\n"
"frameBufferEmulation\\N64DepthCompare=1\n"
"\n"
"[PERFECT%20STRIKER]\n"
"Good_Name=Jikkyou J.League Perfect Striker (J)\n"
"frameBufferEmulation\\N64DepthCompare=1\n"