Skip to content

[Wasm64] Get test_anisotropic passing with MEMORY64 #18971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2023
Merged

[Wasm64] Get test_anisotropic passing with MEMORY64 #18971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/library_glemu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,7 @@ var LibraryGLEmulation = {
(GL.currentContext.compressionExt ? ' GL_ARB_texture_compression GL_EXT_texture_compression_s3tc' : '') +
(GL.currentContext.anisotropicExt ? ' GL_EXT_texture_filter_anisotropic' : '')
);
GL.stringCache[name_] = ret;
return ret;
return GL.stringCache[name_] = {{{ to64('ret') }}};
}
return glGetString(name_);
};
Expand Down Expand Up @@ -3672,6 +3671,7 @@ var LibraryGLEmulation = {
GLImmediate.matrixLib.mat4.set({{{ makeHEAPView('F64', 'matrix', 'matrix+' + (16*8)) }}}, GLImmediate.matrix[GLImmediate.currentMatrix]);
},

glLoadMatrixf__sig: 'vp',
glLoadMatrixf: function(matrix) {
#if GL_DEBUG
if (GL.debug) dbg('glLoadMatrixf receiving: ' + Array.prototype.slice.call(HEAPF32.subarray(matrix >> 2, (matrix >> 2) + 16)));
Expand Down
0 test/aniso.c → test/browser/test_anisotropic.c
View file
Open in desktop
File renamed without changes.
0 test/aniso.png → test/browser/test_anisotropic.png
View file
Open in desktop
File renamed without changes
0 test/water.dds → test/browser/water.dds
View file
Open in desktop
File renamed without changes.
7 changes: 4 additions & 3 deletions test/test_browser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2249,9 +2249,10 @@ def test_s3tc_ffp_only(self):
self.btest('s3tc.c', reference='s3tc.png', args=['--preload-file', 'screenshot.dds', '-sLEGACY_GL_EMULATION', '-sGL_FFP_ONLY', '-lGL', '-lSDL'])

@requires_graphics_hardware
def test_aniso(self):
shutil.copyfile(test_file('water.dds'), 'water.dds')
self.btest('aniso.c', reference='aniso.png', reference_slack=2, args=['--preload-file', 'water.dds', '-sLEGACY_GL_EMULATION', '-lGL', '-lSDL', '-Wno-incompatible-pointer-types'])
@also_with_wasm64
def test_anisotropic(self):
shutil.copyfile(test_file('browser/water.dds'), 'water.dds')
self.btest('browser/test_anisotropic.c', reference='browser/test_anisotropic.png', reference_slack=2, args=['--preload-file', 'water.dds', '-sLEGACY_GL_EMULATION', '-lGL', '-lSDL', '-Wno-incompatible-pointer-types'])

@requires_graphics_hardware
def test_tex_nonbyte(self):
Expand Down