mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-05 09:26:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6321 from Daft-Freak/no-ie

Browse Source 
Delete emscripten CanvasPixelArray (IE10/11) support
This commit is contained in:
Ryan C. Gordon
2022-11-23 14:03:35 -05:00
committed by GitHub
parent 675f77718c 3983c98ece
commit 712457ec28
2 changed files with 46 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/video/emscripten/SDL_emscriptenframebuffer.c
View File

@@ -95,28 +95,13 @@ int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rec
var src = pixels >> 2; var src = pixels >> 2;
var dst = 0; var dst = 0;
var num; var num;
if (typeof CanvasPixelArray !== 'undefined' && data instanceof CanvasPixelArray) {
// IE10/IE11: ImageData objects are backed by the deprecated CanvasPixelArray,
// not UInt8ClampedArray. These don't have buffers, so we need to revert
// to copying a byte at a time. We do the undefined check because modern
// browsers do not define CanvasPixelArray anymore.
num = data.length;
while (dst < num) {
var val = HEAP32[src]; // This is optimized. Instead, we could do {{{ makeGetValue('buffer', 'dst', 'i32') }}};
data[dst ] = val & 0xff;
data[dst+1] = (val >> 8) & 0xff;
data[dst+2] = (val >> 16) & 0xff;
data[dst+3] = 0xff;
src++;
dst += 4;
}
} else {
if (SDL3.data32Data !== data) { if (SDL3.data32Data !== data) {
SDL3.data32 = new Int32Array(data.buffer); SDL3.data32 = new Int32Array(data.buffer);
SDL3.data8 = new Uint8Array(data.buffer); SDL3.data8 = new Uint8Array(data.buffer);
SDL3.data32Data = data; SDL3.data32Data = data;
} }
var data32 = SDL3.data32; var data32 = SDL2.data32;
num = data32.length; num = data32.length;
// logically we need to do // logically we need to do
// while (dst < num) { // while (dst < num) {
@@ -156,7 +141,6 @@ int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rec
i = i + 4 | 0; i = i + 4 | 0;
} }
} }
}
SDL3.ctx.putImageData(SDL3.image, 0, 0); SDL3.ctx.putImageData(SDL3.image, 0, 0);
}, surface->w, surface->h, surface->pixels, data->canvas_id); }, surface->w, surface->h, surface->pixels, data->canvas_id);

23
src/video/emscripten/SDL_emscriptenmouse.c
View File

@@ -92,28 +92,9 @@ Emscripten_CreateCursor(SDL_Surface* surface, int hot_x, int hot_y)
var image = ctx.createImageData(w, h); var image = ctx.createImageData(w, h);
var data = image.data; var data = image.data;
var src = pixels >> 2; var src = pixels >> 2;
var dst = 0;
var num;
if (typeof CanvasPixelArray !== 'undefined' && data instanceof CanvasPixelArray) {
// IE10/IE11: ImageData objects are backed by the deprecated CanvasPixelArray,
// not UInt8ClampedArray. These don't have buffers, so we need to revert
// to copying a byte at a time. We do the undefined check because modern
// browsers do not define CanvasPixelArray anymore.
num = data.length;
while (dst < num) {
var val = HEAP32[src]; // This is optimized. Instead, we could do {{{ makeGetValue('buffer', 'dst', 'i32') }}};
data[dst ] = val & 0xff;
data[dst+1] = (val >> 8) & 0xff;
data[dst+2] = (val >> 16) & 0xff;
data[dst+3] = (val >> 24) & 0xff;
src++;
dst += 4;
}
} else {
var data32 = new Int32Array(data.buffer); var data32 = new Int32Array(data.buffer);
num = data32.length; data32.set(HEAP32.subarray(src, src + data32.length));
data32.set(HEAP32.subarray(src, src + num));
}
ctx.putImageData(image, 0, 0); ctx.putImageData(image, 0, 0);
var url = hot_x === 0 && hot_y === 0 var url = hot_x === 0 && hot_y === 0