gl and event fixes

Author: Destructor17

_build.sh

@@ -45,6 +45,7 @@ do
             $CMAKE_DIR_PATH/SDL3/SDL3testTargets
             $CMAKE_DIR_PATH/SDL2_ttf/SDL2_ttf-static-targets
             $CMAKE_DIR_PATH/SDL3_ttf/SDL3_ttf-static-targets
+            $CMAKE_DIR_PATH/SampleRate/SampleRateTargets
         "
 
         for CMAKE_TARGETS_FILE_TO_PATCH in $CMAKE_TARGETS_FILES_TO_PATCH

libraries/SDL2

@@ -41,19 +41,6 @@ void webroguegfx_gl_size(int *width, int *height) {
   *height = out_height;
 }
 
-__attribute__((import_name("gl_init")))
-__attribute__((import_module("webrogue_gfx"))) void
-imported_webrogue_gfx_init_gl();
-
-// TODO thread_local
-static char sGLInitialized;
-void webroguegfx_init_gl() { 
-  if(!sGLInitialized) {
-    imported_webrogue_gfx_init_gl();
-    sGLInitialized = 1;
-  }
-}
-
 __attribute__((import_name("get_gl_swap_interval")))
 __attribute__((import_module("webrogue_gfx"))) void
 imported_webrogue_gfx_get_gl_swap_interval(uint32_t *out_interval);

libraries/SDL3

@@ -11,35 +11,35 @@ void *webroguegfx_gl_loader(const char *procname);
 void webroguegfx_get_gl_swap_interval(int *out_interval);
 
 // Events
-struct webrogue_event_mouse_down {
-    uint32_t x;
-    uint32_t y;
+struct webrogue_event_mouse_button {
     uint32_t button;
-};
-struct webrogue_event_mouse_up {
+    uint8_t down;
     uint32_t x;
     uint32_t y;
-    uint32_t button;
 };
 struct webrogue_event_mouse_motion {
     uint32_t x;
     uint32_t y;
 };
+struct webrogue_event_key {
+    uint8_t down;
+    uint32_t scancode;
+};
 struct webrogue_event_quit {
 };
 enum webrogue_event_type {
     WEBROGUE_EVENT_TYPE_INVALID = 0,
-    WEBROGUE_EVENT_TYPE_MOUSE_DOWN = 1,
-    WEBROGUE_EVENT_TYPE_MOUSE_UP = 2,
-    WEBROGUE_EVENT_TYPE_MOUSE_MOTION = 3,
-    WEBROGUE_EVENT_TYPE_QUIT = 4,
+    WEBROGUE_EVENT_TYPE_MOUSE_BUTTON = 16,
+    WEBROGUE_EVENT_TYPE_MOUSE_MOTION = 17,
+    WEBROGUE_EVENT_TYPE_KEY = 32,
+    WEBROGUE_EVENT_TYPE_QUIT = 48,
 };
 typedef struct webrogue_event {
     enum webrogue_event_type type;
     union {
-        struct webrogue_event_mouse_down mouse_down;
-        struct webrogue_event_mouse_up mouse_up;
+        struct webrogue_event_mouse_button mouse_button;
         struct webrogue_event_mouse_motion mouse_motion;
+        struct webrogue_event_key key;
         struct webrogue_event_quit quit;
     } inner;
 } webrogue_event;

libraries/webroguegfx/webroguegfx.c

@@ -3,7 +3,7 @@
 #include "webroguegfx.h"
 #include <stdlib.h>
 
-#define WEBROGUE_MAX_ENCODED_EVENT_SIZE 16
+#define WEBROGUE_MAX_ENCODED_EVENT_SIZE 20
 
 __attribute__((import_name("poll")))
 __attribute__((import_module("webrogue_gfx")))
@@ -53,18 +53,12 @@ webrogue_event webroguegfx_poll() {
     const char* current_pointer = ((const char*)buffer_data) + buffer_consumed;
     result.type = GET(uint32_t, 0);
     switch (result.type) {
-        case WEBROGUE_EVENT_TYPE_MOUSE_DOWN: {
-            BUF_SIZE(16);
-            result.inner.mouse_down.x = GET(uint32_t, 4);
-            result.inner.mouse_down.y = GET(uint32_t, 8);
-            result.inner.mouse_down.button = GET(uint32_t, 12);
-            return result;
-        }
-        case WEBROGUE_EVENT_TYPE_MOUSE_UP: {
-            BUF_SIZE(16);
-            result.inner.mouse_up.x = GET(uint32_t, 4);
-            result.inner.mouse_up.y = GET(uint32_t, 8);
-            result.inner.mouse_up.button = GET(uint32_t, 12);
+        case WEBROGUE_EVENT_TYPE_MOUSE_BUTTON: {
+            BUF_SIZE(20);
+            result.inner.mouse_button.button = GET(uint32_t, 4);
+            result.inner.mouse_button.down = GET(uint8_t, 16);
+            result.inner.mouse_button.x = GET(uint32_t, 8);
+            result.inner.mouse_button.y = GET(uint32_t, 12);
             return result;
         }
         case WEBROGUE_EVENT_TYPE_MOUSE_MOTION: {
@@ -73,6 +67,12 @@ webrogue_event webroguegfx_poll() {
             result.inner.mouse_motion.y = GET(uint32_t, 8);
             return result;
         }
+        case WEBROGUE_EVENT_TYPE_KEY: {
+            BUF_SIZE(12);
+            result.inner.key.down = GET(uint8_t, 8);
+            result.inner.key.scancode = GET(uint32_t, 4);
+            return result;
+        }
         case WEBROGUE_EVENT_TYPE_QUIT: {
             BUF_SIZE(4);
             return result;

libraries/webroguegfx/webroguegfx.h

@@ -8,44 +8,49 @@ extern "C" {
 #include "webroguegfx_internal.h"
 }
 
-// clang-format off
-
 #include "gl2_entry.cpp"
 #include "gl2_ftable.h"
 
-static thread_local PFNGLFLUSHPROC sGLFlushThreadLocal;
+__attribute__((import_name("gl_init")))
+__attribute__((import_module("webrogue_gfx"))) void
+imported_webrogue_gfx_init_gl(uint8_t *out_status);
 
-void webrogue_gfx_internal_glFlush(void) {
-  if(sGLFlushThreadLocal) {
-    sGLFlushThreadLocal();
-  }
-}
+static thread_local PFNGLFLUSHPROC sGLFlush = nullptr;
 
-extern "C" void* webroguegfx_gl_loader(const char* procname) {
-  if(!getEGLThreadInfo()->hostConn) {
-    // imported_init_gl();
+extern "C" void webroguegfx_init_gl() {
+  if (!getEGLThreadInfo()->hostConn) {
+    uint8_t status = 0;
+    imported_webrogue_gfx_init_gl(&status);
+    if (!status) {
+      return;
+    }
     getEGLThreadInfo()->hostConn = HostConnection::createUnique();
     getEGLThreadInfo()->hostConn->gl2Encoder()->setClientState(
-      new gfxstream::guest::GLClientState(2, 0)
-    );
-    // TODO GLSharedGroup should be stored in getEGLThreadInfo()->currentContext->sharedGroup
+        new gfxstream::guest::GLClientState(3, 0));
+    // TODO GLSharedGroup should be stored in
+    // getEGLThreadInfo()->currentContext->sharedGroup
     getEGLThreadInfo()->hostConn->gl2Encoder()->setSharedGroup(
-      gfxstream::guest::GLSharedGroupPtr(
-        new gfxstream::guest::GLSharedGroup()
-      )
-    );
-    getEGLThreadInfo()->hostConn->gl2Encoder()->setVersion(
-      3, 0,
-      3, 0
-    );
-    for(int i = 0; i<gl2_num_funcs; i++) {
-      if(strcmp(gl2_funcs_by_name[i].name, "glFlush") == 0) {
-        sGLFlushThreadLocal = (PFNGLFLUSHPROC) gl2_funcs_by_name[i].proc;
+        gfxstream::guest::GLSharedGroupPtr(
+            new gfxstream::guest::GLSharedGroup()));
+    getEGLThreadInfo()->hostConn->gl2Encoder()->setVersion(3, 0, 3, 0);
+    for (int i = 0; i < gl2_num_funcs; i++) {
+      if (strcmp(gl2_funcs_by_name[i].name, "glFlush") == 0) {
+        sGLFlush = (PFNGLFLUSHPROC)gl2_funcs_by_name[i].proc;
       }
     }
   }
-  for(int i = 0; i<gl2_num_funcs; i++) {
-    if(strcmp(gl2_funcs_by_name[i].name, procname) == 0) {
+}
+
+extern "C" void webrogue_gfx_internal_glFlush(void) {
+  if (sGLFlush) {
+    sGLFlush();
+  }
+}
+
+extern "C" void *webroguegfx_gl_loader(const char *procname) {
+  webroguegfx_init_gl();
+  for (int i = 0; i < gl2_num_funcs; i++) {
+    if (strcmp(gl2_funcs_by_name[i].name, procname) == 0) {
       return gl2_funcs_by_name[i].proc;
     }
   }