Skip to content

Commit

Permalink
video-gliden64: Update to commit 3e0c635a.
Browse files Browse the repository at this point in the history 
gonetz/GLideN64@3e0c635a

* 3e0c635a Correct mipmap shader for case when max tile is 0. Up shader storage version.
* b9bfbf40 Indi Particle Optimization hack.
* b0a57531 Implement Factor5 ucodes for Indiana Jones/Battle of Naboo, task #1259
* 582bfe35 Improve check for buggy fragment shader interlock
* 3ff14781 Add matix element conversion functions.
* b0647a64 ZSortBOSS_Audio2(): use absolut value of fraction
* 95d52643 Add better matrix load, insert and store fixed to float logic
* 35f4ad3b gSP.cpp: Replace _FIXED2FLOAT if there is no real fixed to float conversion
* 4750e100 Use _FIXED2FLOATCOLOR
* 997820c0 GBI.h: add better color reciproc values
* bb00ed3f gSPInsertMatrix remove (int) cast and use copysignf
* a8349418 Use _FIXED2FLOAT
* 31ced036 Use FIXED2FLOATRECIP16
* 16dd8145 GBI.h: add better reciproc values
* e80577e1 Allow non-0 default framebuffer
* 44068412 Revert "Add the iOS framebuffer binder from @braindx"
* e3a7acad Fixes build errors with clang
* 6ddaba8e Remove FB Attachment caching
* 67f79724 Shader noise returns 0.5 when noise emulation disabled.
* 6725ad47 Fix warnings of 64bit compiler.
* 10710f96 Fix warnings from compiler and static code analizer.
* bb697c3c Add forceDepthBufferClear in custom.ini
* 8212a1fa Fix vertex Y calculation in GraphicsDrawer::_drawThickLine
* 2ef33722 Dump hires textures cache to file right after load from texture pack. It is more safe than dump when emulator closed.
* 035f76e7 GLideNHQ code refactor: remove code duplication in TxTexCache and TxHiResCache classes.
* e317bb50 Support config.frameBufferEmulation.forceDepthBufferClear setting in UI.
* 2e7c0ece Add forceDepthBufferClear config option. Enable it for Eikou no Saint Andrews (J) in custom settings.
* 725ff742 Update viewport when exiting texrect after texturedRectSpecial call.
  • Loading branch information
@fzurita
fzurita committed Jun 16, 2018
1 parent 56e8a8a commit 8cedfac
Show file tree
Hide file tree
Showing 63 changed files with 3,094 additions and 832 deletions.
6 changes: 4 additions & 2 deletions mupen64plus-video-gliden64/upstream/projects/msvc12/GLideN64.vcxproj
View file
Expand Up @@ -408,8 +408,9 @@ copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)"</Command>
<ClCompile Include="..\..\src\uCodes\F3DGOLDEN.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DPD.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DSETA.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DSWRS.cpp" />
<ClCompile Include="..\..\src\uCodes\F3DTEXA.cpp" />
<ClCompile Include="..\..\src\uCodes\F5Indi_Naboo.cpp" />
<ClCompile Include="..\..\src\uCodes\F5Rogue.cpp" />
<ClCompile Include="..\..\src\uCodes\L3D.cpp" />
<ClCompile Include="..\..\src\uCodes\L3DEX.cpp" />
<ClCompile Include="..\..\src\uCodes\L3DEX2.cpp" />
Expand Down Expand Up @@ -543,8 +544,9 @@ copy /Y "$(ProjectDir)$(OutDir)$(TargetName).*" "$(Mupen64PluginsDir)"</Command>
<ClInclude Include="..\..\src\uCodes\F3DGOLDEN.h" />
<ClInclude Include="..\..\src\uCodes\F3DPD.h" />
<ClInclude Include="..\..\src\uCodes\F3DSETA.h" />
<ClInclude Include="..\..\src\uCodes\F3DSWRS.h" />
<ClInclude Include="..\..\src\uCodes\F3DTEXA.h" />
<ClInclude Include="..\..\src\uCodes\F5Indi_Naboo.h" />
<ClInclude Include="..\..\src\uCodes\F5Rogue.h" />
<ClInclude Include="..\..\src\uCodes\L3D.h" />
<ClInclude Include="..\..\src\uCodes\L3DEX.h" />
<ClInclude Include="..\..\src\uCodes\L3DEX2.h" />
Expand Down
18 changes: 12 additions & 6 deletions mupen64plus-video-gliden64/upstream/projects/msvc12/GLideN64.vcxproj.filters
View file
Expand Up @@ -341,9 +341,6 @@
<ClCompile Include="..\..\src\uCodes\F3DSETA.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F3DSWRS.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F3DTEXA.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
Expand Down Expand Up @@ -380,6 +377,12 @@
<ClCompile Include="..\..\src\DisplayLoadProgress.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F5Indi_Naboo.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
<ClCompile Include="..\..\src\uCodes\F5Rogue.cpp">
<Filter>Source Files\uCodes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\3DMath.h">
Expand Down Expand Up @@ -667,9 +670,6 @@
<ClInclude Include="..\..\src\uCodes\F3DSETA.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F3DSWRS.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F3DTEXA.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
Expand Down Expand Up @@ -706,5 +706,11 @@
<ClInclude Include="..\..\src\DisplayLoadProgress.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F5Indi_Naboo.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
<ClInclude Include="..\..\src\uCodes\F5Rogue.h">
<Filter>Header Files\uCodes</Filter>
</ClInclude>
</ItemGroup>
</Project>
14 changes: 5 additions & 9 deletions mupen64plus-video-gliden64/upstream/projects/msvc12/GLideNUI.vcxproj
View file
Expand Up @@ -100,7 +100,7 @@
<ExceptionHandling>Sync</ExceptionHandling>
<ObjectFileName>$(IntDir)</ObjectFileName>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;OS_WINDOWS;_WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>DEBUG_DUMP;_DEBUG;OS_WINDOWS;_WINDOWS;UNICODE;WIN32;QT_STATICPLUGIN;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;QT_UITOOLS_LIB;QT_WINEXTRAS_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
Expand Down Expand Up @@ -156,17 +156,15 @@
<CustomBuild Include="..\..\src\GLideNUI\AboutDialog.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
if errorlevel 1 goto VCEnd

if errorlevel 1 goto VCEnd
endlocal
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013"</Command>
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DOS_WINDOWS -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing AboutDialog.h...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
if errorlevel 1 goto VCEnd

if errorlevel 1 goto VCEnd
endlocal
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013"</Command>
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DDEBUG_DUMP -D_DEBUG -DOS_WINDOWS -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing AboutDialog.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
Expand All @@ -176,17 +174,15 @@ endlocal
<CustomBuild Include="..\..\src\GLideNUI\ConfigDialog.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">setlocal
if errorlevel 1 goto VCEnd

if errorlevel 1 goto VCEnd
endlocal
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013"</Command>
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DOS_WINDOWS -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Moc%27ing ConfigDialog.h...</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">setlocal
if errorlevel 1 goto VCEnd

if errorlevel 1 goto VCEnd
endlocal
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013"</Command>
"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -DDEBUG_DUMP -D_DEBUG -DOS_WINDOWS -D_WINDOWS -DUNICODE -DWIN32 -DQT_STATICPLUGIN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_UITOOLS_LIB -DQT_WINEXTRAS_LIB "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I." "-I$(QTDIR)\mkspecs\win32-msvc2013" "-I.\GeneratedFiles"</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Moc%27ing ConfigDialog.h...</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
Expand Down
14 changes: 14 additions & 0 deletions mupen64plus-video-gliden64/upstream/projects/msvc2015/GLideN64.sln
View file
Expand Up @@ -23,6 +23,8 @@ Global
MinSizeRel|x64 = MinSizeRel|x64
Release_mupenplus|Win32 = Release_mupenplus|Win32
Release_mupenplus|x64 = Release_mupenplus|x64
Release_with_debug_mupen64plus|Win32 = Release_with_debug_mupen64plus|Win32
Release_with_debug_mupen64plus|x64 = Release_with_debug_mupen64plus|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
RelWithDebInfo|Win32 = RelWithDebInfo|Win32
Expand All @@ -45,6 +47,10 @@ Global
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|Win32.Build.0 = Release_mupenplus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|x64.ActiveCfg = Release_mupenplus|x64
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_mupenplus|x64.Build.0 = Release_mupenplus|x64
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_with_debug_mupen64plus|Win32.ActiveCfg = Release_with_debug_mupen64plus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_with_debug_mupen64plus|Win32.Build.0 = Release_with_debug_mupen64plus|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_with_debug_mupen64plus|x64.ActiveCfg = Release_with_debug_mupen64plus|x64
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release_with_debug_mupen64plus|x64.Build.0 = Release_with_debug_mupen64plus|x64
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release|Win32.ActiveCfg = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release|Win32.Build.0 = Release|Win32
{37D31D7F-C4E7-45B0-AEF6-D6824A243CF7}.Release|x64.ActiveCfg = Release|x64
Expand All @@ -69,6 +75,10 @@ Global
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_mupenplus|Win32.Build.0 = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_mupenplus|x64.ActiveCfg = Release|x64
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_mupenplus|x64.Build.0 = Release|x64
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_with_debug_mupen64plus|Win32.ActiveCfg = Release_with_debug_mupen64plus|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_with_debug_mupen64plus|Win32.Build.0 = Release_with_debug_mupen64plus|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_with_debug_mupen64plus|x64.ActiveCfg = Release_with_debug_mupen64plus|x64
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release_with_debug_mupen64plus|x64.Build.0 = Release_with_debug_mupen64plus|x64
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|Win32.ActiveCfg = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|Win32.Build.0 = Release|Win32
{DA965BCF-2219-47AF-ACE7-EAF76D5D4756}.Release|x64.ActiveCfg = Release|x64
Expand All @@ -93,6 +103,10 @@ Global
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|Win32.Build.0 = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|x64.ActiveCfg = Release|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_mupenplus|x64.Build.0 = Release|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_with_debug_mupen64plus|Win32.ActiveCfg = Release_with_debug_mupen64plus|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_with_debug_mupen64plus|Win32.Build.0 = Release_with_debug_mupen64plus|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_with_debug_mupen64plus|x64.ActiveCfg = Release_with_debug_mupen64plus|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release_with_debug_mupen64plus|x64.Build.0 = Release_with_debug_mupen64plus|x64
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|Win32.ActiveCfg = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|Win32.Build.0 = Release|Win32
{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.Release|x64.ActiveCfg = Release|x64
Expand Down

0 comments on commit 8cedfac

Please sign in to comment.