Skip to content

Commit 3ebab42

Browse files
committed
opengl support for memory64
1 parent e69b6cf commit 3ebab42

File tree

5 files changed

+228
-137
lines changed

5 files changed

+228
-137
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -594,3 +594,4 @@ a license to everyone to use it as detailed in LICENSE.)
594594
* Skye Gibney <[email protected]>
595595
* Piotr Wierciński <[email protected]>
596596
* 郑苏波 (Super Zheng) <[email protected]>
597+
* Philipp Muigg <[email protected]> (copyright owned by Siemens)

src/library_html5.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -544,10 +544,10 @@ var LibraryHTML5 = {
544544
if (targetThread) {
545545
var mouseEventData = _malloc({{{ C_STRUCTS.EmscriptenMouseEvent.__size__ }}}); // This allocated block is passed as satellite data to the proxied function call, so the call frees up the data block when done.
546546
fillMouseEventData(mouseEventData, e, target);
547-
JSEvents.queueEventHandlerOnThread_iiii(targetThread, callbackfunc, eventTypeId, mouseEventData, userData);
547+
JSEvents.queueEventHandlerOnThread_iipp(targetThread, callbackfunc, eventTypeId, mouseEventData, userData);
548548
} else
549549
#endif
550-
if ({{{ makeDynCall('iiii', 'callbackfunc') }}}(eventTypeId, JSEvents.mouseEvent, userData)) e.preventDefault();
550+
if ({{{ makeDynCall('iipp', 'callbackfunc') }}}(eventTypeId, JSEvents.mouseEvent, userData)) e.preventDefault();
551551
};
552552

553553
var eventHandler = {
@@ -646,7 +646,7 @@ var LibraryHTML5 = {
646646
if (targetThread) JSEvents.queueEventHandlerOnThread_iiii(targetThread, callbackfunc, eventTypeId, wheelEvent, userData);
647647
else
648648
#endif
649-
if ({{{ makeDynCall('iiii', 'callbackfunc') }}}(eventTypeId, wheelEvent, userData)) e.preventDefault();
649+
if ({{{ makeDynCall('iipp', 'callbackfunc') }}}(eventTypeId, wheelEvent, userData)) e.preventDefault();
650650
};
651651
#if MIN_IE_VERSION <= 8 || MIN_SAFARI_VERSION < 60100 // Browsers that do not support https://caniuse.com/#feat=mdn-api_wheelevent
652652
// The 'mousewheel' event as implemented in Safari 6.0.5
@@ -658,7 +658,7 @@ var LibraryHTML5 = {
658658
{{{ makeSetValue('JSEvents.wheelEvent', C_STRUCTS.EmscriptenWheelEvent.deltaY, 'wheelDeltaY', 'double') }}};
659659
{{{ makeSetValue('JSEvents.wheelEvent', C_STRUCTS.EmscriptenWheelEvent.deltaZ, '0 /* Not available */', 'double') }}};
660660
{{{ makeSetValue('JSEvents.wheelEvent', C_STRUCTS.EmscriptenWheelEvent.deltaMode, '0 /* DOM_DELTA_PIXEL */', 'i32') }}};
661-
var shouldCancel = {{{ makeDynCall('iiii', 'callbackfunc') }}}( eventTypeId, JSEvents.wheelEvent, userData);
661+
var shouldCancel = {{{ makeDynCall('iipp', 'callbackfunc') }}}( eventTypeId, JSEvents.wheelEvent, userData);
662662
if (shouldCancel) {
663663
e.preventDefault();
664664
}

0 commit comments

Comments
 (0)