isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/isledecomp/isle-portable into draw-cursor

Browse Source
This commit is contained in:
Helloyunho 2025-07-03 12:20:02 +09:00
commit da92589b69
No known key found for this signature in database
GPG Key ID: 6AFA210B0150BE47
3 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ISLE/emscripten/libwasmfs_fetch.js.patch → ISLE/emscripten/emscripten.patch
View File

@ -1,3 +1,16 @@
diff --git a/src/lib/libpthread.js b/src/lib/libpthread.js
index 6d979627e..97e3f8684 100644
--- a/src/lib/libpthread.js
+++ b/src/lib/libpthread.js
@@ -697,7 +697,7 @@ var LibraryPThread = {
{
transferredCanvasNames = UTF8ToString(transferredCanvasNames).trim();
}
- transferredCanvasNames = transferredCanvasNames ? transferredCanvasNames.split(',') : [];
+ transferredCanvasNames = transferredCanvasNames && !Module['disableOffscreenCanvases'] ? transferredCanvasNames.split(',') : [];
#if GL_DEBUG
dbg(`pthread_create: transferredCanvasNames="${transferredCanvasNames}"`);
#endif
diff --git a/src/lib/libwasmfs_fetch.js b/src/lib/libwasmfs_fetch.js diff --git a/src/lib/libwasmfs_fetch.js b/src/lib/libwasmfs_fetch.js
index e8c9f7e21..caf1971d2 100644 index e8c9f7e21..caf1971d2 100644
--- a/src/lib/libwasmfs_fetch.js --- a/src/lib/libwasmfs_fetch.js

39
LEGO1/lego/legoomni/src/common/mxtransitionmanager.cpp
View File

@ -469,17 +469,42 @@ void MxTransitionManager::WindowsTransition()
MxS32 bytesPerPixel = ddsd.ddpfPixelFormat.dwRGBBitCount / 8; MxS32 bytesPerPixel = ddsd.ddpfPixelFormat.dwRGBBitCount / 8;
memset(line, 0, ddsd.lPitch); if (bytesPerPixel == 4) {
MxU32* pixels = (MxU32*) line;
for (int i = 0; i < 640; i++) {
pixels[i] = 0xFF000000;
}
for (MxS32 i = m_animationTimer + 1; i < 480 - m_animationTimer; i++) { for (MxS32 i = m_animationTimer + 1; i < 480 - m_animationTimer - 1; i++) {
line += ddsd.lPitch; line += ddsd.lPitch;
pixels = (MxU32*) line;
pixels[m_animationTimer] = 0xFF000000;
pixels[639 - m_animationTimer] = 0xFF000000;
}
memset(line + m_animationTimer * bytesPerPixel, 0, bytesPerPixel); if (m_animationTimer < 240 - 1) {
memset(line + 640 + (-1 - m_animationTimer) * bytesPerPixel, 0, bytesPerPixel); line += ddsd.lPitch;
pixels = (MxU32*) line;
for (int i = 0; i < 640; i++) {
pixels[i] = 0xFF000000;
}
}
} }
else {
memset(line, 0, 640 * bytesPerPixel);
line += ddsd.lPitch; for (MxS32 i = m_animationTimer + 1; i < 480 - m_animationTimer - 1; i++) {
memset(line, 0, ddsd.lPitch); line += ddsd.lPitch;
memset(line + m_animationTimer * bytesPerPixel, 0, bytesPerPixel);
memset(line + (639 - m_animationTimer) * bytesPerPixel, 0, bytesPerPixel);
}
if (m_animationTimer < 240 - 1) {
line += ddsd.lPitch;
memset(line, 0, 640 * bytesPerPixel);
}
}
SetupCopyRect(&ddsd); SetupCopyRect(&ddsd);
m_ddSurface->Unlock(ddsd.lpSurface); m_ddSurface->Unlock(ddsd.lpSurface);

6
docker/emscripten/Dockerfile
View File

@ -16,10 +16,10 @@ RUN chown -R emscripten:emscripten /src
USER emscripten USER emscripten
COPY ISLE/emscripten/libwasmfs_fetch.js.patch /tmp/ COPY ISLE/emscripten/emscripten.patch /tmp/
RUN cd /emsdk/upstream/emscripten && \ RUN cd /emsdk/upstream/emscripten && \
git apply --check /tmp/libwasmfs_fetch.js.patch && \ git apply --check /tmp/emscripten.patch && \
git apply /tmp/libwasmfs_fetch.js.patch git apply /tmp/emscripten.patch
COPY --chown=emscripten:emscripten 3rdparty/ ./3rdparty/ COPY --chown=emscripten:emscripten 3rdparty/ ./3rdparty/
COPY --chown=emscripten:emscripten LEGO1/ ./LEGO1/ COPY --chown=emscripten:emscripten LEGO1/ ./LEGO1/