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' into Config

Browse Source
This commit is contained in:
BagelSketches 2025-07-03 12:52:08 +10:00 committed by GitHub
commit 5e9b113efb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 35 additions and 7 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

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

@ -248,7 +248,7 @@ void MxTransitionManager::DissolveTransition()
} }
else { else {
MxU8* surf = (MxU8*) ddsd.lpSurface + ddsd.lPitch * row + xShift * 4; MxU8* surf = (MxU8*) ddsd.lpSurface + ddsd.lPitch * row + xShift * 4;
*(MxU32*) surf = 0; *(MxU32*) surf = 0xFF000000;
} }
} }
} }
@ -416,10 +416,25 @@ void MxTransitionManager::WipeDownTransition()
// For each of the 240 animation ticks, blank out two scanlines // For each of the 240 animation ticks, blank out two scanlines
// starting at the top of the screen. // starting at the top of the screen.
MxU8* line = (MxU8*) ddsd.lpSurface + 2 * ddsd.lPitch * m_animationTimer; MxU8* line = (MxU8*) ddsd.lpSurface + 2 * ddsd.lPitch * m_animationTimer;
memset(line, 0, ddsd.lPitch);
line += ddsd.lPitch; if (ddsd.ddpfPixelFormat.dwRGBBitCount == 32) {
memset(line, 0, ddsd.lPitch); MxU32* pixels = (MxU32*) line;
int pixelsPerLine = ddsd.lPitch / 4;
for (int i = 0; i < pixelsPerLine; i++) {
pixels[i] = 0xFF000000;
}
line += ddsd.lPitch;
pixels = (MxU32*) line;
for (int i = 0; i < pixelsPerLine; i++) {
pixels[i] = 0xFF000000;
}
}
else {
memset(line, 0, ddsd.lPitch);
line += ddsd.lPitch;
memset(line, 0, ddsd.lPitch);
}
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/