preserve-emulation/RMG
1
0
Fork 0
mirror of https://github.com/Rosalie241/RMG.git synced 2026-07-11 01:24:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

3rdParty: update mupen64plus-video-GLideN64

Browse Source
This commit is contained in:
Rosalie Wanders
2026-01-13 13:23:38 +01:00
parent bd3f8f081c
commit 8552e07ed8
7 changed files with 1649 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/3rdParty/mupen64plus-video-GLideN64/.gitrepo
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:/gonetz/GLideN64.git
branch = master
commit = 0ab1c5b819c96353a8571d8d5c324cc0cf0ff9f2
parent = 0dce7ddaf4540b2df4f219bd8481268a2e69d004
commit = 89617ddc015d75adb760dbc1a8ce4c40ad1b7b6a
parent = 43a44e4d01af47d36b2b6c8c671460d88ae64ef4
method = merge
cmdver = 0.4.9
Source/3rdParty/mupen64plus-video-GLideN64/src/CMakeLists.txt
Vendored
+8
View File
@@ -525,6 +525,14 @@ if(EGL)
set(OPENGL_LIBRARIES ${EGL_LIB})
else(EGL)
find_package(OpenGL REQUIRED)
if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
add_compile_definitions(OS_FREEBSD)
if(OPENGL_FOUND)
include_directories(${OPENGL_INCLUDE_DIR})
endif()
endif()
include_directories(${OpenGL_INCLUDE_DIRS})
link_directories(${OpenGL_LIBRARY_DIRS})
add_definitions(${OpenGL_DEFINITIONS})
Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNHQ/TxFilter.cpp
Vendored
+1 -1
View File
@@ -623,7 +623,7 @@ TxFilter::dmptx(uint8 *src, int width, int height, int rowStridePixel,
if (!osal_path_existsW(tmpbuf.c_str()) && osal_mkdirp(tmpbuf.c_str()) != 0)
return 0;
if (n64FmtSz._format == 0x2) {
if ((n64FmtSz._format == 0x0 && n64FmtSz._size == 0x0) || n64FmtSz._format == 0x2) {
wchar_t wbuf[256];
tx_swprintf(wbuf, 256, wst("/%ls#%08X#%01X#%01X#%08X_ciByRGBA.png"), _ident.c_str(), r_crc64._texture, n64FmtSz._format, n64FmtSz._size, r_crc64._palette);
tmpbuf.append(wbuf);
Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNUI/ConfigDialog.cpp
Vendored
+4 -5
View File
@@ -501,13 +501,12 @@ void ConfigDialog::setIniPath(const QString & _strIniPath, const QString & _strS
#ifdef M64P_GLIDENUI
if (translationFiles.empty())
ui->userInterfaceGroupBox->hide();
else
#endif
{
ui->verticalLayout_4->removeItem(ui->userInterfaceSpacer);
delete ui->userInterfaceSpacer;
ui->userInterfaceGroupBox->hide();
QSpacerItem* verticalSpacer = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
ui->verticalLayout_4->addItem(verticalSpacer);
}
#endif
const QString currentTranslation = getTranslationFile();
int listIndex = 0;
Source/3rdParty/mupen64plus-video-GLideN64/src/GLideNUI/configDialog.ui
Vendored
+63 -63
View File
@@ -3,7 +3,7 @@
<class>ConfigDialog</class>
<widget class="QDialog" name="ConfigDialog">
<property name="windowModality">
<enum>Qt::WindowModality::WindowModal</enum>
<enum>Qt::WindowModal</enum>
</property>
<property name="geometry">
<rect>
@@ -25,7 +25,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="sizeConstraint">
<enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<widget class="QTabWidget" name="tabWidget">
@@ -389,7 +389,7 @@
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -484,7 +484,7 @@
<property name="topMargin">
<number>2</number>
</property>
<item alignment="Qt::AlignmentFlag::AlignTop">
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="aliasingOffLabel">
<property name="text">
<string>Off</string>
@@ -510,10 +510,10 @@
<number>1</number>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TickPosition::TicksBelow</enum>
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
@@ -528,10 +528,10 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -570,10 +570,10 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -592,7 +592,7 @@
<property name="topMargin">
<number>2</number>
</property>
<item alignment="Qt::AlignmentFlag::AlignTop">
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="aliasingHighLabel">
<property name="text">
<string extracomment="The highest of a set of numbers">High</string>
@@ -644,7 +644,7 @@
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
</property>
</widget>
</item>
@@ -698,7 +698,7 @@
<property name="topMargin">
<number>2</number>
</property>
<item alignment="Qt::AlignmentFlag::AlignTop">
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="anisotropicOffLabel">
<property name="text">
<string>Off</string>
@@ -724,7 +724,7 @@
<number>2</number>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
@@ -733,7 +733,7 @@
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::TickPosition::TicksBelow</enum>
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>2</number>
@@ -748,10 +748,10 @@
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -790,10 +790,10 @@
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -812,7 +812,7 @@
<property name="topMargin">
<number>2</number>
</property>
<item alignment="Qt::AlignmentFlag::AlignTop">
<item alignment="Qt::AlignTop">
<widget class="QLabel" name="anisotropicHighLabel">
<property name="text">
<string extracomment="The highest of a set of numbers">High</string>
@@ -881,7 +881,7 @@
<item>
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -951,7 +951,7 @@
<item>
<spacer name="verticalSpacer_11">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1029,7 +1029,7 @@
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
</property>
</widget>
</item>
@@ -1225,7 +1225,7 @@
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1285,10 +1285,10 @@
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1303,7 +1303,7 @@
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1362,7 +1362,7 @@
<item>
<spacer name="verticalSpacer_15">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1629,10 +1629,10 @@
<string notr="true">color: rgba(0, 0, 0, 15%);</string>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
@@ -1681,10 +1681,10 @@
<item>
<spacer name="verticalSpacer_13">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Preferred</enum>
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1707,7 +1707,7 @@
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1760,7 +1760,7 @@
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByKeyboard|Qt::TextInteractionFlag::LinksAccessibleByMouse</set>
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
</property>
</widget>
</item>
@@ -1844,7 +1844,7 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Unchecking this option disables many effects including cropping, aspect ratio, N64 resolution factor, N64-style depth compare and more. Don't uncheck this option unless you have performance issues.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::TextFormat::RichText</enum>
<enum>Qt::RichText</enum>
</property>
<property name="scaledContents">
<bool>false</bool>
@@ -1860,10 +1860,10 @@
<item>
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1876,10 +1876,10 @@
<item>
<widget class="QFrame" name="frameBufferOptionsFrame">
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
<enum>QFrame::Plain</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_61">
<property name="spacing">
@@ -2082,10 +2082,10 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The depth buffer is used to emulate some effects (e.g. coronas):&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Never&lt;/span&gt;: Depth buffer is disabled.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;From VRAM&lt;/span&gt;: Your video card's depth buffer is copied to N64 memory each frame, which can be slow on some games.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;In software&lt;/span&gt;: Generally faster than copying from VRAM, but the result can be imperfect.&lt;/p&gt;&lt;p&gt;[Recommended:&lt;span style=&quot; font-style:italic;&quot;&gt; In software&lt;/span&gt;]&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
<enum>QFrame::Plain</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_58">
<property name="spacing">
@@ -2212,7 +2212,7 @@
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -2235,7 +2235,7 @@
<item>
<spacer name="verticalSpacer_9">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -2449,7 +2449,7 @@
<item>
<spacer name="verticalSpacer_12">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -2467,10 +2467,10 @@
<string notr="true">color: rgba(0, 0, 0, 15%);</string>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
<enum>QFrame::Plain</enum>
</property>
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
@@ -2782,7 +2782,7 @@
<item>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -2798,10 +2798,10 @@
<item>
<widget class="QFrame" name="textureFilterLimitFrame">
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Shadow::Plain</enum>
<enum>QFrame::Plain</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_28">
<property name="spacing">
@@ -2842,7 +2842,7 @@
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -2898,7 +2898,7 @@
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3459,7 +3459,7 @@
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3553,10 +3553,10 @@
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3616,7 +3616,7 @@
<item>
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3631,7 +3631,7 @@
<item>
<spacer name="horizontalSpacer_24">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3647,7 +3647,7 @@
<string>Preview</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
<set>Qt::AlignCenter</set>
</property>
<property name="margin">
<number>2</number>
@@ -3710,7 +3710,7 @@ The font's full name can be found in Settings&gt;Personalization&gt;Fonts</strin
<item>
<spacer name="verticalSpacer_8">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3723,7 +3723,7 @@ The font's full name can be found in Settings&gt;Personalization&gt;Fonts</strin
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3741,7 +3741,7 @@ The font's full name can be found in Settings&gt;Personalization&gt;Fonts</strin
<item>
<spacer name="verticalSpacer_14">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3799,7 +3799,7 @@ The font's full name can be found in Settings&gt;Personalization&gt;Fonts</strin
<item>
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3900,7 +3900,7 @@ The font's full name can be found in Settings&gt;Personalization&gt;Fonts</strin
<item>
<spacer name="horizontalSpacer_14">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3919,7 +3919,7 @@ The font's full name can be found in Settings&gt;Personalization&gt;Fonts</strin
<string notr="true">padding:4px 1em;min-width:47px</string>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::StandardButton::Close|QDialogButtonBox::StandardButton::Ok|QDialogButtonBox::StandardButton::RestoreDefaults|QDialogButtonBox::StandardButton::Save</set>
<set>QDialogButtonBox::Close|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults|QDialogButtonBox::Save</set>
</property>
</widget>
</item>
Source/3rdParty/mupen64plus-video-GLideN64/src/Graphics/OpenGLContext/GLFunctions.cpp
Vendored
+10
View File
@@ -59,6 +59,16 @@ static void* IOSGLGetProcAddress (const char *name)
#define glGetProcAddress IOSGLGetProcAddress
#define GL_GET_PROC_ADR(proc_type, proc_name) ptr##proc_name = (proc_type)glGetProcAddress("gl"#proc_name)
#elif defined(OS_FREEBSD)
#include <GL/glx.h>
#ifndef glGetProcAddress
#define glGetProcAddress glXGetProcAddress
#endif
#undef GL_GET_PROC_ADR
#define GL_GET_PROC_ADR(proc_type, proc_name) \
ptr##proc_name = (proc_type) glGetProcAddress((const GLubyte*)"gl" #proc_name)
#endif
//GL Functions
Source/3rdParty/mupen64plus-video-GLideN64/translations/gliden64_ko.ts
Vendored
+1561
View File
File diff suppressed because it is too large Load Diff