Fix emscripten_webgl_make_context_current under wasm64/CAN_ADDRESS_2GB

Author: sbc100

.circleci/config.yml

@@ -803,6 +803,7 @@ jobs:
           test_targets: "
             browser_2gb.test_gles2_uniform_arrays
             browser_2gb.test_fetch_to_memory
+            browser_2gb.test_emscripten_animate_canvas_element_size_manual_css
             browser skip:browser.test_4gb_fail
             "
   test-browser-chrome-wasm64:

src/library_html5_webgl.js

@@ -184,7 +184,7 @@ var LibraryHtml5WebGL = {
   },
 #if PTHREADS && OFFSCREEN_FRAMEBUFFER
   // Runs on the calling thread, proxies if needed.
-  emscripten_webgl_make_context_current_calling_thread__sig: 'ii',
+  emscripten_webgl_make_context_current_calling_thread__sig: 'ip',
   emscripten_webgl_make_context_current_calling_thread: (contextHandle) => {
     var success = GL.makeContextCurrent(contextHandle);
     if (success) GL.currentContextIsProxied = false; // If succeeded above, we will have a local GL context from this thread (worker or main).

test/canvas_animate_resize.cpp

@@ -33,8 +33,7 @@ int program;
 int frameNumber = 0;
 EMSCRIPTEN_WEBGL_CONTEXT_HANDLE ctx;
 
-void tick()
-{
+void tick() {
   double sizeScale = 21.0 + 20.0 * sin(emscripten_get_now()*0.001);
   double w = 18.0*sizeScale;
   double h = 11.0*sizeScale;
@@ -73,8 +72,7 @@ void tick()
 #endif
 
   ++frameNumber;
-  if (frameNumber >= NUM_FRAMES_TO_RENDER)
-  {
+  if (frameNumber >= NUM_FRAMES_TO_RENDER) {
 #if TEST_EMSCRIPTEN_SET_MAIN_LOOP
     emscripten_cancel_main_loop();
 #endif
@@ -85,8 +83,8 @@ void tick()
   }
 }
 
-void init()
-{
+void init() {
+  printf("init\n");
   glGenBuffers(1, &vb);
   glBindBuffer(GL_ARRAY_BUFFER, vb);
   float vertices[] = { -1, -1, -1,  1, 1, -1, 1,  1 };
@@ -123,9 +121,8 @@ int main()
   attr.explicitSwapControl = EM_TRUE;
 #endif
   ctx = emscripten_webgl_create_context("#canvas", &attr);
-  printf("Created context with handle %u\n", (unsigned int)ctx);
-  if (!ctx)
-  {
+  printf("Created context with handle %#lx\n", ctx);
+  if (!ctx) {
     if (!emscripten_supports_offscreencanvas()) {
       EM_ASM({
         xhr = new XMLHttpRequest();
@@ -144,8 +141,7 @@ int main()
 #if TEST_EMSCRIPTEN_SET_MAIN_LOOP
   emscripten_set_main_loop(tick, 0, 0);
 #else
-  for(int i = 0; i < NUM_FRAMES_TO_RENDER; ++i)
-  {
+  for(int i = 0; i < NUM_FRAMES_TO_RENDER; ++i) {
     tick();
     emscripten_current_thread_process_queued_calls();
     usleep(16*1000);