swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-12 14:18:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Optimization] (GL_Drawing): kinda fix SyncAllTexturesToGLES, getting main menu to work

Browse Source
This commit is contained in:
swung0x48
2025-05-08 17:14:42 +08:00
parent 40cf5a1ebb
commit 1953dd60bf
1 changed files with 31 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MG/MG_GL/Implementations/GL/Drawing/GL_Drawing.cpp
+31 -68
View File
@@ -394,89 +394,52 @@ namespace MG_GL::GL {
void SyncAllTexturesToGLES(TextureState* textureState) { void SyncAllTexturesToGLES(TextureState* textureState) {
MG_Util::Debug::LogD("Syncing all textures to GLES..."); MG_Util::Debug::LogD("Syncing all textures to GLES...");
for (auto& [mgTexId, texObj] : textureState->textures) { for (auto& [mgTexId, texObj] : textureState->textures) {
if (!texObj.generated) continue; if (!texObj.generated)
continue;
GLuint glTexId = 0;
if (s_textureMap.find(mgTexId) == s_textureMap.end()) { if (s_textureMap.find(mgTexId) == s_textureMap.end()) {
GLuint glTexId;
CallAndCheck(::GLES::glGenTextures(1, &glTexId);) CallAndCheck(::GLES::glGenTextures(1, &glTexId);)
s_textureMap[mgTexId] = glTexId; s_textureMap[mgTexId] = glTexId;
GLenum target = texObj.target; MG_Util::Debug::LogD("Created new GLES texture %u (MobileGL ID)", mgTexId);
CallAndCheck(::GLES::glBindTexture(target, glTexId);)
for (auto& [pname, param] : texObj.params.texPropertiesInt) {
CallAndCheck(::GLES::glTexParameteri(target, pname, param);)
}
for (auto& [pname, param] : texObj.params.texPropertiesFloat) {
CallAndCheck(::GLES::glTexParameterf(target, pname, param);)
}
for (auto& [level, mip] : texObj.params.mipmapData) {
const void* data = !mip.pixelData.empty() ? mip.pixelData.data() : nullptr;
switch (target) {
case GL_TEXTURE_2D: {
GLenum internalFormat = 0, type = 0, format = 0;
NormalizePixelFormat(mip.internalFormat, mip.type, mip.format, &internalFormat, &type, &format);
CallAndCheck(::GLES::glTexImage2D(
target, level, internalFormat,
mip.width, mip.height, 0,
format, type, data
);)
s_textureLevelUploaded[mgTexId][level] = true;
MG_Util::Debug::LogD("Initial upload texture %u level %d (size=%zu)",
mgTexId, level, mip.pixelData.size());
break;
}
default:
MG_Util::Debug::LogE("Unsupported target: %s", MG_Util::Debug::GLEnumToString(target));
}
}
MG_Util::Debug::LogD("Created and synced new GLES texture %u (MobileGL ID)", mgTexId);
} else { } else {
GLuint glTexId = s_textureMap[mgTexId]; glTexId = s_textureMap[mgTexId];
GLenum target = texObj.target; }
CallAndCheck(::GLES::glBindTexture(target, glTexId);) GLenum target = texObj.target;
CallAndCheck(::GLES::glBindTexture(target, glTexId);)
for (auto& [level, mip] : texObj.params.mipmapData) { for (auto& [pname, param] : texObj.params.texPropertiesInt) {
if (!s_textureLevelUploaded[mgTexId][level]) { CallAndCheck(::GLES::glTexParameteri(target, pname, param);)
bool levelInitialized = s_textureLevelUploaded[mgTexId].count(level); }
const void* data = !mip.pixelData.empty() ? mip.pixelData.data() : nullptr; for (auto& [pname, param] : texObj.params.texPropertiesFloat) {
CallAndCheck(::GLES::glTexParameterf(target, pname, param);)
}
for (auto& [level, mip] : texObj.params.mipmapData) {
const void* data = !mip.pixelData.empty() ? mip.pixelData.data() : nullptr;
switch (target) {
case GL_TEXTURE_2D: {
GLenum internalFormat = 0, type = 0, format = 0; GLenum internalFormat = 0, type = 0, format = 0;
NormalizePixelFormat(mip.internalFormat, mip.type, mip.format, &internalFormat, &type, &format); NormalizePixelFormat(mip.internalFormat, mip.type, mip.format, &internalFormat, &type, &format);
switch (target) { CallAndCheck(::GLES::glTexImage2D(
case GL_TEXTURE_2D: target, level, internalFormat,
if (levelInitialized) { mip.width, mip.height, 0,
CallAndCheck(::GLES::glTexSubImage2D( format, type, data
target, level, );)
0, 0, s_textureLevelUploaded[mgTexId][level] = true;
mip.width, mip.height, MG_Util::Debug::LogD("Initial upload texture %u level %d (size=%zu)",
format, type, data mgTexId, level, mip.pixelData.size());
);) break;
s_textureLevelUploaded[mgTexId][level] = true;
MG_Util::Debug::LogD("Updated texture %u level %d with glTexSubImage2D", mgTexId, level);
} else {
CallAndCheck(::GLES::glTexImage2D(
target, level, internalFormat,
mip.width, mip.height, 0,
format, type, data
);)
s_textureLevelUploaded[mgTexId][level] = true;
MG_Util::Debug::LogD("Initialized texture %u level %d with glTexImage2D", mgTexId, level);
}
break;
default:
MG_Util::Debug::LogE("Unsupported target: %s", MG_Util::Debug::GLEnumToString(target));
}
} }
default:
MG_Util::Debug::LogE("Unsupported target: %s", MG_Util::Debug::GLEnumToString(target));
} }
MG_Util::Debug::LogD("Updated existing GLES texture %u (MobileGL ID)", mgTexId);
} }
MG_Util::Debug::LogD("Updated GLES texture %u (MobileGL ID)", mgTexId);
} }
CallAndCheck(::GLES::glBindTexture(GL_TEXTURE_2D, 0);)
} }
// static std::unordered_map<GLuint, void*> s_bufferDirtyFlags_bufferObj; // static std::unordered_map<GLuint, void*> s_bufferDirtyFlags_bufferObj;
void SyncAllBuffersToGLES(BufferState* bufferState) { void SyncAllBuffersToGLES(BufferState* bufferState) {
GLint prev_vbo = 0; GLint prev_vbo = 0;