swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-10 21:28:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (MG_State/EGLState): fix compilation error on 32-bit arch where EGLAttrib & EGLint are the same type and collides

Browse Source
This commit is contained in:
swung0x48
2026-05-03 19:52:29 +08:00
parent c1ebd01a70
commit 212309083a
2 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MobileGL/MG_State/EGLState/Core.cpp
+13 -24
View File
@@ -14,6 +14,19 @@ namespace MobileGL {
namespace { namespace {
constexpr EGLint EGL_DISPLAY_MAJOR_VERSION = 1; constexpr EGLint EGL_DISPLAY_MAJOR_VERSION = 1;
constexpr EGLint EGL_DISPLAY_MINOR_VERSION = 5; constexpr EGLint EGL_DISPLAY_MINOR_VERSION = 5;
template <typename AttrType>
Optional<AttrType> ParseAttribValue(const AttrType* attribList, EGLint attrib) {
if (!attribList) {
return Nullopt;
}
for (SizeT i = 0; attribList[i] != EGL_NONE; i += 2) {
if (attribList[i] == static_cast<AttrType>(attrib)) {
return attribList[i + 1];
}
}
return Nullopt;
}
} // namespace } // namespace
Bool EGLContext::DisplayLookupKey::operator==(const DisplayLookupKey& rhs) const { Bool EGLContext::DisplayLookupKey::operator==(const DisplayLookupKey& rhs) const {
@@ -65,30 +78,6 @@ namespace MobileGL {
return apiIt->second; return apiIt->second;
} }
Optional<EGLint> EGLContext::ParseAttribValue(const EGLint* attribList, EGLint attrib) {
if (!attribList) {
return Nullopt;
}
for (SizeT i = 0; attribList[i] != EGL_NONE; i += 2) {
if (attribList[i] == attrib) {
return attribList[i + 1];
}
}
return Nullopt;
}
Optional<EGLAttrib> EGLContext::ParseAttribValue(const EGLAttrib* attribList, EGLint attrib) {
if (!attribList) {
return Nullopt;
}
for (SizeT i = 0; attribList[i] != EGL_NONE; i += 2) {
if (attribList[i] == static_cast<EGLAttrib>(attrib)) {
return attribList[i + 1];
}
}
return Nullopt;
}
EGLContext::EGLDisplayHandle EGLContext::GetOrCreateDisplay(Uint64 nativeDisplayKey, EGLenum platform) { EGLContext::EGLDisplayHandle EGLContext::GetOrCreateDisplay(Uint64 nativeDisplayKey, EGLenum platform) {
const DisplayLookupKey key = { const DisplayLookupKey key = {
.NativeDisplayKey = nativeDisplayKey, .NativeDisplayKey = nativeDisplayKey,
MobileGL/MG_State/EGLState/Core.h
-2
View File
@@ -210,8 +210,6 @@ namespace MobileGL {
} }
} }
static Optional<EGLint> ParseAttribValue(const EGLint* attribList, EGLint attrib);
static Optional<EGLAttrib> ParseAttribValue(const EGLAttrib* attribList, EGLint attrib);
static std::thread::id CurrentThreadKey(); static std::thread::id CurrentThreadKey();
EGLDisplayHandle GetOrCreateDisplay(Uint64 nativeDisplayKey, EGLenum platform); EGLDisplayHandle GetOrCreateDisplay(Uint64 nativeDisplayKey, EGLenum platform);