[Video] Rename glide64 to Project64-video
This commit is contained in:
zilmar
parent
9efae26d0c
commit
ea009c1ca1
|
|
@ -21,10 +21,10 @@ COMMON_CPPFLAGS := \
|
|||
include $(JNI_LOCAL_PATH)/3rdParty/png/png.mk
|
||||
include $(JNI_LOCAL_PATH)/3rdParty/zlib/zlib.mk
|
||||
include $(JNI_LOCAL_PATH)/Common/common.mk
|
||||
include $(JNI_LOCAL_PATH)/Glide64/Glide64.mk
|
||||
include $(JNI_LOCAL_PATH)/PluginAudio/PluginAudio.mk
|
||||
include $(JNI_LOCAL_PATH)/PluginInput/PluginInput.mk
|
||||
include $(JNI_LOCAL_PATH)/PluginRSP/PluginRSP.mk
|
||||
include $(JNI_LOCAL_PATH)/Project64-bridge/Project64-bridge.mk
|
||||
include $(JNI_LOCAL_PATH)/Project64-core/Project64-core.mk
|
||||
include $(JNI_LOCAL_PATH)/Project64-video/Project64-video.mk
|
||||
include $(JNI_LOCAL_PATH)/Settings/Settings.mk
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
*.cpp
|
||||
*.h
|
||||
*.vcproj
|
||||
*.vcxproj
|
||||
*.vcxproj.filters
|
||||
*.dsp
|
||||
*.plg
|
||||
*.txt
|
||||
*.rc
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
###############################
|
||||
# Project64-gfx-glide64
|
||||
###############################
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_PATH := $(JNI_LOCAL_PATH)
|
||||
SRCDIR := ./
|
||||
|
||||
LOCAL_MODULE := Project64-gfx-glide64
|
||||
LOCAL_STATIC_LIBRARIES := common \
|
||||
zlib \
|
||||
Settings \
|
||||
png \
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/$(SRCDIR)/Glitch64/inc \
|
||||
$(LOCAL_PATH)/$(SRCDIR)/3rdParty \
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(SRCDIR)/Glitch64/OGLEScombiner.cpp \
|
||||
$(SRCDIR)/Glitch64/OGLESgeometry.cpp \
|
||||
$(SRCDIR)/Glitch64/OGLESglitchmain.cpp \
|
||||
$(SRCDIR)/Glitch64/OGLEStextures.cpp \
|
||||
$(SRCDIR)/Glitch64/OGLESwrappers.cpp \
|
||||
$(SRCDIR)/Glide64/3dmath.cpp \
|
||||
$(SRCDIR)/Glide64/Android.cpp \
|
||||
$(SRCDIR)/Glide64/Combine.cpp \
|
||||
$(SRCDIR)/Glide64/Config.cpp \
|
||||
$(SRCDIR)/Glide64/CRC.cpp \
|
||||
$(SRCDIR)/Glide64/Debugger.cpp \
|
||||
$(SRCDIR)/Glide64/DepthBufferRender.cpp \
|
||||
$(SRCDIR)/Glide64/FBtoScreen.cpp \
|
||||
$(SRCDIR)/Glide64/Main.cpp \
|
||||
$(SRCDIR)/Glide64/rdp.cpp \
|
||||
$(SRCDIR)/Glide64/ScreenResolution.cpp \
|
||||
$(SRCDIR)/Glide64/Settings.cpp \
|
||||
$(SRCDIR)/Glide64/TexBuffer.cpp \
|
||||
$(SRCDIR)/Glide64/TexCache.cpp \
|
||||
$(SRCDIR)/Glide64/trace.cpp \
|
||||
$(SRCDIR)/Glide64/Util.cpp \
|
||||
$(SRCDIR)/Glide64/Ext_TxFilter.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxFilterExport.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxFilter.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxCache.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxTexCache.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxHiResCache.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxQuantize.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxUtil.cpp \
|
||||
$(SRCDIR)/GlideHQ/TextureFilters.cpp \
|
||||
$(SRCDIR)/GlideHQ/TextureFilters_2xsai.cpp \
|
||||
$(SRCDIR)/GlideHQ/TextureFilters_hq2x.cpp \
|
||||
$(SRCDIR)/GlideHQ/TextureFilters_hq4x.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxImage.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxReSample.cpp \
|
||||
$(SRCDIR)/GlideHQ/TxDbg.cpp \
|
||||
$(SRCDIR)/GlideHQ/tc-1.1+/fxt1.c \
|
||||
$(SRCDIR)/GlideHQ/tc-1.1+/dxtn.c \
|
||||
$(SRCDIR)/GlideHQ/tc-1.1+/wrapper.c \
|
||||
$(SRCDIR)/GlideHQ/tc-1.1+/texstore.c \
|
||||
|
||||
LOCAL_CFLAGS := \
|
||||
$(COMMON_CFLAGS) \
|
||||
-DUSE_FRAMESKIPPER \
|
||||
-DNOSSE \
|
||||
-DUSE_GLES \
|
||||
-fsigned-char \
|
||||
|
||||
LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
|
||||
|
||||
LOCAL_CPP_FEATURES := exceptions
|
||||
|
||||
LOCAL_LDLIBS := \
|
||||
-ldl \
|
||||
-lGLESv2 \
|
||||
-llog \
|
||||
-latomic \
|
||||
|
||||
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
|
||||
# Use for ARM7a:
|
||||
LOCAL_CFLAGS += -mfpu=vfp
|
||||
LOCAL_CFLAGS += -mfloat-abi=softfp
|
||||
|
||||
endif
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
*.cpp
|
||||
*.h
|
||||
*.vcproj
|
||||
*.vcxproj
|
||||
*.vcxproj.filters
|
||||
*.dsp
|
||||
*.plg
|
||||
*.txt
|
||||
*.rc
|
||||
|
|
@ -0,0 +1,84 @@
|
|||
###############################
|
||||
# Project64-gfx-Project64
|
||||
###############################
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_PATH := $(JNI_LOCAL_PATH)
|
||||
SRCDIR := ./
|
||||
|
||||
LOCAL_MODULE := Project64-gfx-Project64
|
||||
LOCAL_STATIC_LIBRARIES := common \
|
||||
zlib \
|
||||
Settings \
|
||||
png \
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(LOCAL_PATH)/$(SRCDIR)/Project64-video/Renderer/inc \
|
||||
$(LOCAL_PATH)/$(SRCDIR)/3rdParty \
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(SRCDIR)/Project64-video/3dmath.cpp \
|
||||
$(SRCDIR)/Project64-video/Android.cpp \
|
||||
$(SRCDIR)/Project64-video/Combine.cpp \
|
||||
$(SRCDIR)/Project64-video/Config.cpp \
|
||||
$(SRCDIR)/Project64-video/CRC.cpp \
|
||||
$(SRCDIR)/Project64-video/Debugger.cpp \
|
||||
$(SRCDIR)/Project64-video/DepthBufferRender.cpp \
|
||||
$(SRCDIR)/Project64-video/FBtoScreen.cpp \
|
||||
$(SRCDIR)/Project64-video/Main.cpp \
|
||||
$(SRCDIR)/Project64-video/rdp.cpp \
|
||||
$(SRCDIR)/Project64-video/ScreenResolution.cpp \
|
||||
$(SRCDIR)/Project64-video/Settings.cpp \
|
||||
$(SRCDIR)/Project64-video/TexBuffer.cpp \
|
||||
$(SRCDIR)/Project64-video/TexCache.cpp \
|
||||
$(SRCDIR)/Project64-video/trace.cpp \
|
||||
$(SRCDIR)/Project64-video/Util.cpp \
|
||||
$(SRCDIR)/Project64-video/Ext_TxFilter.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLEScombiner.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLESgeometry.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLESglitchmain.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLEStextures.cpp \
|
||||
$(SRCDIR)/Project64-video/Renderer/OGLESwrappers.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxFilterExport.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxFilter.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxCache.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxTexCache.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxHiResCache.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxQuantize.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxUtil.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TextureFilters.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TextureFilters_2xsai.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TextureFilters_hq2x.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TextureFilters_hq4x.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxImage.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxReSample.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/TxDbg.cpp \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/tc-1.1+/fxt1.c \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/tc-1.1+/dxtn.c \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/tc-1.1+/wrapper.c \
|
||||
$(SRCDIR)/Project64-video/TextureEnhancer/tc-1.1+/texstore.c \
|
||||
|
||||
LOCAL_CFLAGS := \
|
||||
$(COMMON_CFLAGS) \
|
||||
-DUSE_FRAMESKIPPER \
|
||||
-DNOSSE \
|
||||
-DUSE_GLES \
|
||||
-fsigned-char \
|
||||
|
||||
LOCAL_CPPFLAGS := $(COMMON_CPPFLAGS)
|
||||
|
||||
LOCAL_CPP_FEATURES := exceptions
|
||||
|
||||
LOCAL_LDLIBS := \
|
||||
-ldl \
|
||||
-lGLESv2 \
|
||||
-llog \
|
||||
-latomic \
|
||||
|
||||
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
|
||||
# Use for ARM7a:
|
||||
LOCAL_CFLAGS += -mfpu=vfp
|
||||
LOCAL_CFLAGS += -mfloat-abi=softfp
|
||||
|
||||
endif
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2010 or later
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.25420.1
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}"
|
||||
EndProject
|
||||
|
|
@ -31,12 +31,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64Setup", "Source\In
|
|||
{FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Glide64\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Glitch64\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\GlideHQ\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PJ64 NRage", "Source\nragev20\NRage_Input_V2.vcxproj", "{FD617E80-9E40-4138-85DA-B94633972E6A}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{181AA451-63A7-4E3B-BE0C-F92BE3F3D2F2}"
|
||||
|
|
@ -62,6 +56,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PluginRSP", "Source\Android
|
|||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JniBridge", "Source\Android\Bridge\Bridge.vcxproj", "{593B00E6-1987-415D-A62C-26533FC3E95C}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glide64", "Source\Project64-video\Glide64.vcxproj", "{A4D13408-A794-4199-8FC7-4A9A32505005}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glitch64", "Source\Project64-video\Renderer\Glitch64.vcxproj", "{462C2608-182F-452C-944F-AF201E19300B}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GlideHQ", "Source\Project64-video\TextureEnhancer\GlideHQ.vcxproj", "{2DADDAA5-0F57-46ED-A974-747908DDC7F3}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
|
|
@ -131,30 +131,6 @@ Global
|
|||
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|Win32.Build.0 = Release|Win32
|
||||
{360A34F3-3172-4B09-8BC9-B3FBEE677863}.Release|x64.ActiveCfg = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.Build.0 = Debug|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.Build.0 = Release|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.Build.0 = Debug|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.ActiveCfg = Release|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.Build.0 = Release|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.Build.0 = Debug|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.Build.0 = Release|x64
|
||||
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{FD617E80-9E40-4138-85DA-B94633972E6A}.Debug|x64.ActiveCfg = Debug|x64
|
||||
|
|
@ -203,6 +179,30 @@ Global
|
|||
{593B00E6-1987-415D-A62C-26533FC3E95C}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{593B00E6-1987-415D-A62C-26533FC3E95C}.Release|Win32.Build.0 = Release|Win32
|
||||
{593B00E6-1987-415D-A62C-26533FC3E95C}.Release|x64.ActiveCfg = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Debug|x64.Build.0 = Debug|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|Win32.Build.0 = Release|Win32
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.ActiveCfg = Release|x64
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005}.Release|x64.Build.0 = Release|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Debug|x64.Build.0 = Debug|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|Win32.Build.0 = Release|Win32
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.ActiveCfg = Release|x64
|
||||
{462C2608-182F-452C-944F-AF201E19300B}.Release|x64.Build.0 = Release|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Debug|x64.Build.0 = Debug|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|Win32.Build.0 = Release|Win32
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.ActiveCfg = Release|x64
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
@ -211,13 +211,13 @@ Global
|
|||
{3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
|
||||
{4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
|
||||
{731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{17836496-31B0-46F2-B1B1-366D7DF6F04C} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26}
|
||||
{D233025A-231F-4A43-92B6-E87193C60ACC} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
|
||||
{1133A1CC-A9E5-4026-B20D-6A2987130D4E} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
|
||||
{B685BB34-D700-4FCC-8503-9B6AA1A0C95D} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
|
||||
{593B00E6-1987-415D-A62C-26533FC3E95C} = {0E0FCAC2-E128-4886-8EE6-1BCA84551F58}
|
||||
{A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
{2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
#include "Util.h"
|
||||
#include "Combine.h"
|
||||
#include "trace.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
#define FASTSEARCH // Enable fast combine mode searching algorithm
|
||||
|
||||
|
|
@ -619,7 +619,7 @@ COMBINE cmb;
|
|||
cmb.tmu0_a_fac = GR_COMBINE_FACTOR_DETAIL_FACTOR, \
|
||||
percent = (float)(rdp.env_color&0xFF) / 255.0f, \
|
||||
cmb.dc0_detailmax = cmb.dc1_detailmax = percent
|
||||
|
||||
|
||||
#define CC(color) cmb.ccolor=(color)&0xFFFFFF00
|
||||
#define CC_BYTE(byte) { cmb.ccolor=(byte<<8)|(byte<<16)|(byte<<24); }
|
||||
#define CC_C1MULC2(color1, color2) { \
|
||||
|
|
@ -15513,7 +15513,7 @@ void Combine()
|
|||
{
|
||||
lod_frac = 10;
|
||||
}
|
||||
|
||||
|
||||
rdp.noise = RDP::noise_none;
|
||||
|
||||
uint32_t found = TRUE;
|
||||
|
|
@ -15842,7 +15842,7 @@ void CombineBlender()
|
|||
case 0x5000: /* Vigilante 8 explosions */
|
||||
A_BLEND(GR_BLEND_ONE_MINUS_SRC_ALPHA, GR_BLEND_SRC_ALPHA);
|
||||
break;
|
||||
|
||||
|
||||
case 0xFA00: // Bomberman second attack
|
||||
A_BLEND(GR_BLEND_ONE, GR_BLEND_ZERO);
|
||||
break;
|
||||
|
|
@ -15853,7 +15853,7 @@ void CombineBlender()
|
|||
A_BLEND(GR_BLEND_ONE, GR_BLEND_ZERO);
|
||||
else
|
||||
A_BLEND(GR_BLEND_ZERO, GR_BLEND_ONE);
|
||||
break;
|
||||
break;
|
||||
|
||||
default:
|
||||
A_BLEND(GR_BLEND_SRC_ALPHA, GR_BLEND_ONE_MINUS_SRC_ALPHA);
|
||||
|
|
@ -16646,4 +16646,4 @@ void TexAlphaCombinerToExtension(GrChipID_t tmu)
|
|||
cmb.t1a_ext_d = ta_ext_d;
|
||||
cmb.t1a_ext_d_invert = ta_ext_d_invert;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
#include "Gfx_1.3.h"
|
||||
#include "FBtoScreen.h"
|
||||
#include "TexCache.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
static int SetupFBtoScreenCombiner(uint32_t texture_size, uint32_t opaque)
|
||||
{
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(Root)Source/Glitch64/inc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(Root)Source/Project64-video/Renderer/inc;inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>__MSC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Platform)'=='x64'">NO_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">RDP_LOGGING;RDP_ERROR_LOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
|
|
@ -133,21 +133,22 @@
|
|||
<ProjectReference Include="..\3rdParty\png\png.vcxproj">
|
||||
<Project>{17836496-31b0-46f2-b1b1-366d7df6f04c}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\3rdParty\zlib\zlib.vcxproj">
|
||||
<Project>{731bd205-2826-4631-b7af-117658e88dbc}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Common\Common.vcxproj">
|
||||
<Project>{b4a4b994-9111-42b1-93c2-6f1ca8bc4421}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\GlideHQ\GlideHQ.vcxproj">
|
||||
<Project>{2daddaa5-0f57-46ed-a974-747908ddc7f3}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Glitch64\Glitch64.vcxproj">
|
||||
<Project>{462c2608-182f-452c-944f-af201e19300b}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Settings\Settings.vcxproj">
|
||||
<Project>{8b9961b1-88d9-4ea3-a752-507a00dd9f3d}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="Renderer\Glitch64.vcxproj">
|
||||
<Project>{462c2608-182f-452c-944f-af201e19300b}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="TextureEnhancer\GlideHQ.vcxproj">
|
||||
<Project>{2daddaa5-0f57-46ed-a974-747908ddc7f3}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include <stdlib.h>
|
||||
#include "glide.h"
|
||||
#include "glitchmain.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
static int fct[4], source0[4], operand0[4], source1[4], operand1[4], source2[4], operand2[4];
|
||||
static int fcta[4], sourcea0[4], operanda0[4], sourcea1[4], operanda1[4], sourcea2[4], operanda2[4];
|
||||
|
|
@ -424,7 +424,7 @@ void compile_shader()
|
|||
}
|
||||
|
||||
if (shader_programs != NULL)
|
||||
shader_programs = (shader_program_key*)realloc(shader_programs, (number_of_programs + 1)*sizeof(shader_program_key));
|
||||
shader_programs = (shader_program_key*)realloc(shader_programs, (number_of_programs + 1) * sizeof(shader_program_key));
|
||||
else
|
||||
shader_programs = (shader_program_key*)malloc(sizeof(shader_program_key));
|
||||
//printf("number of shaders %d\n", number_of_programs);
|
||||
|
|
@ -710,9 +710,9 @@ void writeGLSLColorFactor(int factor, int local, int need_local, int other, int
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grColorCombine(
|
||||
GrCombineFunction_t function, GrCombineFactor_t factor,
|
||||
GrCombineLocal_t local, GrCombineOther_t other,
|
||||
FxBool invert)
|
||||
GrCombineFunction_t function, GrCombineFactor_t factor,
|
||||
GrCombineLocal_t local, GrCombineOther_t other,
|
||||
FxBool invert)
|
||||
{
|
||||
WriteTrace(TraceResolution, TraceDebug, "function: %d factor: %d local: %d other: %d invert: %d", function, factor, local, other, invert);
|
||||
|
||||
|
|
@ -918,9 +918,9 @@ void writeGLSLAlphaFactor(int factor, int local, int need_local, int other, int
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grAlphaCombine(
|
||||
GrCombineFunction_t function, GrCombineFactor_t factor,
|
||||
GrCombineLocal_t local, GrCombineOther_t other,
|
||||
FxBool invert
|
||||
GrCombineFunction_t function, GrCombineFactor_t factor,
|
||||
GrCombineLocal_t local, GrCombineOther_t other,
|
||||
FxBool invert
|
||||
)
|
||||
{
|
||||
WriteTrace(TraceResolution, TraceDebug, "function: %d factor: %d local: %d other: %d invert: %d", function, factor, local, other, invert);
|
||||
|
|
@ -1152,13 +1152,13 @@ void writeGLSLTextureAlphaFactor(int num_tex, int factor)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grTexCombine(
|
||||
GrChipID_t tmu,
|
||||
GrCombineFunction_t rgb_function,
|
||||
GrCombineFactor_t rgb_factor,
|
||||
GrCombineFunction_t alpha_function,
|
||||
GrCombineFactor_t alpha_factor,
|
||||
FxBool rgb_invert,
|
||||
FxBool alpha_invert
|
||||
GrChipID_t tmu,
|
||||
GrCombineFunction_t rgb_function,
|
||||
GrCombineFactor_t rgb_factor,
|
||||
GrCombineFunction_t alpha_function,
|
||||
GrCombineFactor_t alpha_factor,
|
||||
FxBool rgb_invert,
|
||||
FxBool alpha_invert
|
||||
)
|
||||
{
|
||||
WriteTrace(TraceResolution, TraceDebug, "tmu: %d rgb_function: %d rgb_factor: %d alpha_function: %d alpha_factor: %d rgb_invert: %d alpha_invert: %d", tmu, rgb_function, rgb_factor, alpha_function, alpha_factor, rgb_invert, alpha_invert);
|
||||
|
|
@ -1407,8 +1407,8 @@ FxBool alpha_invert
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grAlphaBlendFunction(
|
||||
GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df,
|
||||
GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df
|
||||
GrAlphaBlendFnc_t rgb_sf, GrAlphaBlendFnc_t rgb_df,
|
||||
GrAlphaBlendFnc_t alpha_sf, GrAlphaBlendFnc_t alpha_df
|
||||
)
|
||||
{
|
||||
int sfactorRGB = 0, dfactorRGB = 0, sfactorAlpha = 0, dfactorAlpha = 0;
|
||||
|
|
@ -1556,7 +1556,7 @@ guFogTableIndexToW(int i)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
guFogGenerateLinear(GrFog_t * /*fogtable*/,
|
||||
float nearZ, float farZ)
|
||||
float nearZ, float farZ)
|
||||
{
|
||||
WriteTrace(TraceResolution, TraceDebug, "nearZ: %f farZ: %f", nearZ, farZ);
|
||||
glFogi(GL_FOG_MODE, GL_LINEAR);
|
||||
|
|
@ -1723,10 +1723,10 @@ grStippleMode(GrStippleMode_t mode)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode,
|
||||
GrCCUColor_t b, GrCombineMode_t b_mode,
|
||||
GrCCUColor_t c, FxBool c_invert,
|
||||
GrCCUColor_t d, FxBool d_invert,
|
||||
FxU32 shift, FxBool invert)
|
||||
GrCCUColor_t b, GrCombineMode_t b_mode,
|
||||
GrCCUColor_t c, FxBool c_invert,
|
||||
GrCCUColor_t d, FxBool d_invert,
|
||||
FxU32 shift, FxBool invert)
|
||||
{
|
||||
WriteTrace(TraceResolution, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
|
||||
if (invert) WriteTrace(TraceGlitch, TraceWarning, "grColorCombineExt : inverted result");
|
||||
|
|
@ -1905,10 +1905,10 @@ FxU32 shift, FxBool invert)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
|
||||
GrACUColor_t b, GrCombineMode_t b_mode,
|
||||
GrACUColor_t c, FxBool c_invert,
|
||||
GrACUColor_t d, FxBool d_invert,
|
||||
FxU32 shift, FxBool invert)
|
||||
GrACUColor_t b, GrCombineMode_t b_mode,
|
||||
GrACUColor_t c, FxBool c_invert,
|
||||
GrACUColor_t d, FxBool d_invert,
|
||||
FxU32 shift, FxBool invert)
|
||||
{
|
||||
WriteTrace(TraceResolution, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
|
||||
if (invert) WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : inverted result");
|
||||
|
|
@ -2057,11 +2057,11 @@ FxU32 shift, FxBool invert)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grTexColorCombineExt(GrChipID_t tmu,
|
||||
GrTCCUColor_t a, GrCombineMode_t a_mode,
|
||||
GrTCCUColor_t b, GrCombineMode_t b_mode,
|
||||
GrTCCUColor_t c, FxBool c_invert,
|
||||
GrTCCUColor_t d, FxBool d_invert,
|
||||
FxU32 shift, FxBool invert)
|
||||
GrTCCUColor_t a, GrCombineMode_t a_mode,
|
||||
GrTCCUColor_t b, GrCombineMode_t b_mode,
|
||||
GrTCCUColor_t c, FxBool c_invert,
|
||||
GrTCCUColor_t d, FxBool d_invert,
|
||||
FxU32 shift, FxBool invert)
|
||||
{
|
||||
int num_tex;
|
||||
WriteTrace(TraceResolution, TraceDebug, "tmu: %d a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
|
||||
|
|
@ -2422,11 +2422,11 @@ FxU32 shift, FxBool invert)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grTexAlphaCombineExt(GrChipID_t tmu,
|
||||
GrTACUColor_t a, GrCombineMode_t a_mode,
|
||||
GrTACUColor_t b, GrCombineMode_t b_mode,
|
||||
GrTACUColor_t c, FxBool c_invert,
|
||||
GrTACUColor_t d, FxBool d_invert,
|
||||
FxU32 shift, FxBool invert)
|
||||
GrTACUColor_t a, GrCombineMode_t a_mode,
|
||||
GrTACUColor_t b, GrCombineMode_t b_mode,
|
||||
GrTACUColor_t c, FxBool c_invert,
|
||||
GrTACUColor_t d, FxBool d_invert,
|
||||
FxU32 shift, FxBool invert)
|
||||
{
|
||||
int num_tex;
|
||||
WriteTrace(TraceResolution, TraceDebug, "tmu: %d a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift, invert: %d", tmu, a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
|
||||
|
|
@ -2706,7 +2706,7 @@ FxU32 shift, FxBool invert)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grConstantColorValueExt(GrChipID_t tmu,
|
||||
GrColor_t value)
|
||||
GrColor_t value)
|
||||
{
|
||||
int num_tex;
|
||||
WriteTrace(TraceResolution, TraceDebug, "tmu: %d value: %d", tmu, value);
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#endif // _WIN32
|
||||
#include "glide.h"
|
||||
#include "glitchmain.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
#define Z_MAX (65536.0f)
|
||||
|
||||
|
|
@ -368,16 +368,16 @@ grDrawTriangle(const void *a, const void *b, const void *c)
|
|||
{
|
||||
if (st0_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *a_s0 / *a_q / (float)tex1_width,
|
||||
ytex(0, *a_t0 / *a_q / (float)tex1_height));
|
||||
ytex(0, *a_t0 / *a_q / (float)tex1_height));
|
||||
if (st1_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *a_s1 / *a_q / (float)tex0_width,
|
||||
ytex(1, *a_t1 / *a_q / (float)tex0_height));
|
||||
ytex(1, *a_t1 / *a_q / (float)tex0_height));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st0_en)
|
||||
glTexCoord2f(*a_s0 / *a_q / (float)tex0_width,
|
||||
ytex(0, *a_t0 / *a_q / (float)tex0_height));
|
||||
ytex(0, *a_t0 / *a_q / (float)tex0_height));
|
||||
}
|
||||
if (pargb_en)
|
||||
glColor4f(a_pargb[2] / 255.0f, a_pargb[1] / 255.0f, a_pargb[0] / 255.0f, a_pargb[3] / 255.0f);
|
||||
|
|
@ -395,16 +395,16 @@ grDrawTriangle(const void *a, const void *b, const void *c)
|
|||
{
|
||||
if (st0_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *b_s0 / *b_q / (float)tex1_width,
|
||||
ytex(0, *b_t0 / *b_q / (float)tex1_height));
|
||||
ytex(0, *b_t0 / *b_q / (float)tex1_height));
|
||||
if (st1_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *b_s1 / *b_q / (float)tex0_width,
|
||||
ytex(1, *b_t1 / *b_q / (float)tex0_height));
|
||||
ytex(1, *b_t1 / *b_q / (float)tex0_height));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st0_en)
|
||||
glTexCoord2f(*b_s0 / *b_q / (float)tex0_width,
|
||||
ytex(0, *b_t0 / *b_q / (float)tex0_height));
|
||||
ytex(0, *b_t0 / *b_q / (float)tex0_height));
|
||||
}
|
||||
if (pargb_en)
|
||||
glColor4f(b_pargb[2] / 255.0f, b_pargb[1] / 255.0f, b_pargb[0] / 255.0f, b_pargb[3] / 255.0f);
|
||||
|
|
@ -423,16 +423,16 @@ grDrawTriangle(const void *a, const void *b, const void *c)
|
|||
{
|
||||
if (st0_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *c_s0 / *c_q / (float)tex1_width,
|
||||
ytex(0, *c_t0 / *c_q / (float)tex1_height));
|
||||
ytex(0, *c_t0 / *c_q / (float)tex1_height));
|
||||
if (st1_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *c_s1 / *c_q / (float)tex0_width,
|
||||
ytex(1, *c_t1 / *c_q / (float)tex0_height));
|
||||
ytex(1, *c_t1 / *c_q / (float)tex0_height));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st0_en)
|
||||
glTexCoord2f(*c_s0 / *c_q / (float)tex0_width,
|
||||
ytex(0, *c_t0 / *c_q / (float)tex0_height));
|
||||
ytex(0, *c_t0 / *c_q / (float)tex0_height));
|
||||
}
|
||||
if (pargb_en)
|
||||
glColor4f(c_pargb[2] / 255.0f, c_pargb[1] / 255.0f, c_pargb[0] / 255.0f, c_pargb[3] / 255.0f);
|
||||
|
|
@ -481,16 +481,16 @@ grDrawPoint(const void *pt)
|
|||
{
|
||||
if (st0_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *s0 / *q / (float)tex1_width,
|
||||
ytex(0, *t0 / *q / (float)tex1_height));
|
||||
ytex(0, *t0 / *q / (float)tex1_height));
|
||||
if (st1_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *s1 / *q / (float)tex0_width,
|
||||
ytex(1, *t1 / *q / (float)tex0_height));
|
||||
ytex(1, *t1 / *q / (float)tex0_height));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st0_en)
|
||||
glTexCoord2f(*s0 / *q / (float)tex0_width,
|
||||
ytex(0, *t0 / *q / (float)tex0_height));
|
||||
ytex(0, *t0 / *q / (float)tex0_height));
|
||||
}
|
||||
if (pargb_en)
|
||||
glColor4f(pargb[2] / 255.0f, pargb[1] / 255.0f, pargb[0] / 255.0f, pargb[3] / 255.0f);
|
||||
|
|
@ -574,16 +574,16 @@ grDrawLine(const void *a, const void *b)
|
|||
{
|
||||
if (st0_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *b_s0 / *b_q / (float)tex1_width,
|
||||
ytex(0, *b_t0 / *b_q / (float)tex1_height));
|
||||
ytex(0, *b_t0 / *b_q / (float)tex1_height));
|
||||
if (st1_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *b_s1 / *b_q / (float)tex0_width,
|
||||
ytex(1, *b_t1 / *b_q / (float)tex0_height));
|
||||
ytex(1, *b_t1 / *b_q / (float)tex0_height));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st0_en)
|
||||
glTexCoord2f(*b_s0 / *b_q / (float)tex0_width,
|
||||
ytex(0, *b_t0 / *b_q / (float)tex0_height));
|
||||
ytex(0, *b_t0 / *b_q / (float)tex0_height));
|
||||
}
|
||||
if (pargb_en)
|
||||
glColor4f(b_pargb[2] / 255.0f, b_pargb[1] / 255.0f, b_pargb[0] / 255.0f, b_pargb[3] / 255.0f);
|
||||
|
|
@ -646,16 +646,16 @@ grDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2)
|
|||
{
|
||||
if (st0_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *s0 / *q / (float)tex1_width,
|
||||
ytex(0, *t0 / *q / (float)tex1_height));
|
||||
ytex(0, *t0 / *q / (float)tex1_height));
|
||||
if (st1_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *s1 / *q / (float)tex0_width,
|
||||
ytex(1, *t1 / *q / (float)tex0_height));
|
||||
ytex(1, *t1 / *q / (float)tex0_height));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st0_en)
|
||||
glTexCoord2f(*s0 / *q / (float)tex0_width,
|
||||
ytex(0, *t0 / *q / (float)tex0_height));
|
||||
ytex(0, *t0 / *q / (float)tex0_height));
|
||||
}
|
||||
if (pargb_en)
|
||||
glColor4f(pargb[2] / 255.0f, pargb[1] / 255.0f, pargb[0] / 255.0f, pargb[3] / 255.0f);
|
||||
|
|
@ -723,16 +723,16 @@ grDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 strid
|
|||
{
|
||||
if (st0_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE1_ARB, *s0 / *q / (float)tex1_width,
|
||||
ytex(0, *t0 / *q / (float)tex1_height));
|
||||
ytex(0, *t0 / *q / (float)tex1_height));
|
||||
if (st1_en)
|
||||
glMultiTexCoord2fARB(GL_TEXTURE0_ARB, *s1 / *q / (float)tex0_width,
|
||||
ytex(1, *t1 / *q / (float)tex0_height));
|
||||
ytex(1, *t1 / *q / (float)tex0_height));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (st0_en)
|
||||
glTexCoord2f(*s0 / *q / (float)tex0_width,
|
||||
ytex(0, *t0 / *q / (float)tex0_height));
|
||||
ytex(0, *t0 / *q / (float)tex0_height));
|
||||
}
|
||||
if (pargb_en)
|
||||
glColor4f(pargb[2] / 255.0f, pargb[1] / 255.0f, pargb[0] / 255.0f, pargb[3] / 255.0f);
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
#include "glide.h"
|
||||
#include "g3ext.h"
|
||||
#include "glitchmain.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
#include <Common/Util.h>
|
||||
|
||||
#ifdef VPDEBUG
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
#include "glitchmain.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
/* Napalm extensions to GrTextureFormat_t */
|
||||
#define GR_TEXFMT_ARGB_CMP_FXT1 0x11
|
||||
|
|
@ -66,7 +66,7 @@ void remove_tex(unsigned int idmin, unsigned int idmax)
|
|||
while (aux && aux->id >= idmin && aux->id < idmax)
|
||||
{
|
||||
if (n >= sz)
|
||||
t = (unsigned int *)realloc(t, ++sz*sizeof(int));
|
||||
t = (unsigned int *)realloc(t, ++sz * sizeof(int));
|
||||
t[n++] = aux->id;
|
||||
aux = aux->next;
|
||||
free(list);
|
||||
|
|
@ -79,7 +79,7 @@ void remove_tex(unsigned int idmin, unsigned int idmax)
|
|||
{
|
||||
texlist *aux2 = aux->next->next;
|
||||
if (n >= sz)
|
||||
t = (unsigned int *)realloc(t, ++sz*sizeof(int));
|
||||
t = (unsigned int *)realloc(t, ++sz * sizeof(int));
|
||||
t[n++] = aux->next->id;
|
||||
free(aux->next);
|
||||
aux->next = aux2;
|
||||
|
|
@ -160,7 +160,7 @@ grTexMaxAddress(GrChipID_t tmu)
|
|||
|
||||
FX_ENTRY FxU32 FX_CALL
|
||||
grTexTextureMemRequired(FxU32 evenOdd,
|
||||
GrTexInfo *info)
|
||||
GrTexInfo *info)
|
||||
{
|
||||
WriteTrace(TraceGlitch, TraceDebug, "evenOdd = %d", evenOdd);
|
||||
int width, height;
|
||||
|
|
@ -209,8 +209,8 @@ GrTexInfo *info)
|
|||
|
||||
FX_ENTRY FxU32 FX_CALL
|
||||
grTexCalcMemRequired(
|
||||
GrLOD_t lodmin, GrLOD_t lodmax,
|
||||
GrAspectRatio_t aspect, GrTextureFormat_t fmt)
|
||||
GrLOD_t lodmin, GrLOD_t lodmax,
|
||||
GrAspectRatio_t aspect, GrTextureFormat_t fmt)
|
||||
{
|
||||
WriteTrace(TraceGlitch, TraceDebug, "lodmin = %d, lodmax: %d aspect: %d fmt: %d", lodmin, lodmax, aspect, fmt);
|
||||
int width, height;
|
||||
|
|
@ -384,9 +384,9 @@ int grTexFormat2GLPackedFmt(int fmt, int * gltexfmt, int * glpixfmt, int * glpac
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grTexDownloadMipMap(GrChipID_t tmu,
|
||||
FxU32 startAddress,
|
||||
FxU32 evenOdd,
|
||||
GrTexInfo *info)
|
||||
FxU32 startAddress,
|
||||
FxU32 evenOdd,
|
||||
GrTexInfo *info)
|
||||
{
|
||||
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, startAddress: %d evenOdd: %d", tmu, startAddress, evenOdd);
|
||||
|
||||
|
|
@ -647,9 +647,9 @@ int CheckTextureBufferFormat(GrChipID_t tmu, FxU32 startAddress, GrTexInfo *info
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grTexSource(GrChipID_t tmu,
|
||||
FxU32 startAddress,
|
||||
FxU32 evenOdd,
|
||||
GrTexInfo *info)
|
||||
FxU32 startAddress,
|
||||
FxU32 evenOdd,
|
||||
GrTexInfo *info)
|
||||
{
|
||||
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, startAddress: %d evenOdd: %d", tmu, startAddress, evenOdd);
|
||||
|
||||
|
|
@ -719,7 +719,7 @@ GrTexInfo *info)
|
|||
#if 0
|
||||
extern int auxbuffer;
|
||||
static int oldbuffer;
|
||||
FX_ENTRY void FX_CALL grAuxBufferExt( GrBuffer_t buffer );
|
||||
FX_ENTRY void FX_CALL grAuxBufferExt(GrBuffer_t buffer);
|
||||
if (auxbuffer == GR_BUFFER_AUXBUFFER && auxbuffer != oldbuffer)
|
||||
grAuxBufferExt(auxbuffer);
|
||||
oldbuffer = auxbuffer;
|
||||
|
|
@ -729,10 +729,10 @@ GrTexInfo *info)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grTexDetailControl(
|
||||
GrChipID_t tmu,
|
||||
int lod_bias,
|
||||
FxU8 detail_scale,
|
||||
float detail_max
|
||||
GrChipID_t tmu,
|
||||
int lod_bias,
|
||||
FxU8 detail_scale,
|
||||
float detail_max
|
||||
)
|
||||
{
|
||||
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, lod_bias: %d detail_scale: %d detail_max: %d", tmu, lod_bias, detail_scale, detail_max);
|
||||
|
|
@ -760,9 +760,9 @@ grTexLodBiasValue(GrChipID_t tmu, float bias)
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grTexFilterMode(
|
||||
GrChipID_t tmu,
|
||||
GrTextureFilterMode_t minfilter_mode,
|
||||
GrTextureFilterMode_t magfilter_mode
|
||||
GrChipID_t tmu,
|
||||
GrTextureFilterMode_t minfilter_mode,
|
||||
GrTextureFilterMode_t magfilter_mode
|
||||
)
|
||||
{
|
||||
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, bias: %d magfilter_mode: %d", tmu, minfilter_mode, magfilter_mode);
|
||||
|
|
@ -796,9 +796,9 @@ GrTextureFilterMode_t magfilter_mode
|
|||
|
||||
FX_ENTRY void FX_CALL
|
||||
grTexClampMode(
|
||||
GrChipID_t tmu,
|
||||
GrTextureClampMode_t s_clampmode,
|
||||
GrTextureClampMode_t t_clampmode
|
||||
GrChipID_t tmu,
|
||||
GrTextureClampMode_t s_clampmode,
|
||||
GrTextureClampMode_t t_clampmode
|
||||
)
|
||||
{
|
||||
WriteTrace(TraceGlitch, TraceDebug, "tmu = %d, s_clampmode: %d t_clampmode: %d", tmu, s_clampmode, t_clampmode);
|
||||
|
|
@ -11,7 +11,7 @@ void dump_stop();
|
|||
extern int dumping;
|
||||
#endif
|
||||
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
#define zscale 1.0f
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#include <Common/StdString.h>
|
||||
#include <Settings/Settings.h>
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
#include "Gfx_1.3.h"
|
||||
#include "ScreenResolution.h"
|
||||
#include "SettingsID.h"
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
#include "Gfx_1.3.h"
|
||||
#include "TexBuffer.h"
|
||||
#include "CRC.h"
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
static TBUFF_COLOR_IMAGE * AllocateTextureBuffer(COLOR_IMAGE & cimage)
|
||||
{
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
#include "Combine.h"
|
||||
#include "Util.h"
|
||||
#include <Common/Util.h>
|
||||
#include <Glide64/trace.h>
|
||||
#include <Project64-video/trace.h>
|
||||
|
||||
void LoadTex(int id, int tmu);
|
||||
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
#include <stdarg.h>
|
||||
#include <Common/StdString.h>
|
||||
#include <Common/path.h>
|
||||
#include <Glide64/Config.h>
|
||||
#include <Glide64/Settings.h>
|
||||
#include <Project64-video/Config.h>
|
||||
#include <Project64-video/Settings.h>
|
||||
|
||||
TxDbg::TxDbg()
|
||||
{
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue