mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-21 15:01:01 +01:00
[gpu] Share demo_view between WebGL and WebGPU web demos
Refactor demo_view to work without GLFW (guarded by HB_GPU_NO_GLFW): - Add demo_view_create_headless() for non-GLFW use - Store fb/window dimensions in the view struct - Use emscripten_get_now() for timing when on Emscripten - Guard GLFW-specific calls (fullscreen, window close, cursor query) Rewrite WebGPU entry point to use demo_view and demo_renderer_t interface instead of duplicated view/input code. This gives the WebGPU demo identical trackball rotation, drag-release animation, keyboard shortcuts, and gamma cycling as the GL demos. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
41973ac2c4
commit
ca2fb1eb68
6 files changed
+442
-516
No files matched your search
@@ -38,6 +38,7 @@ struct demo_renderer_t
|
||||
};
|
||||
|
||||
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
demo_renderer_t *
|
||||
demo_renderer_create_gl (GLFWwindow *window);
|
||||
|
||||
@@ -45,6 +46,7 @@ demo_renderer_create_gl (GLFWwindow *window);
|
||||
demo_renderer_t *
|
||||
demo_renderer_create_metal (GLFWwindow *window);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
#endif /* DEMO_RENDERER_H */
|
||||
+61
-6
@@ -5,12 +5,22 @@
|
||||
|
||||
#include "demo-view.h"
|
||||
|
||||
#ifdef __EMSCRIPTEN__
|
||||
#include <emscripten.h>
|
||||
#endif
|
||||
|
||||
#include "trackball.hh"
|
||||
#include "matrix4x4.hh"
|
||||
|
||||
struct demo_view_t {
|
||||
demo_renderer_t *renderer;
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
GLFWwindow *window;
|
||||
#endif
|
||||
|
||||
/* Cached window/framebuffer dimensions */
|
||||
int fb_width, fb_height;
|
||||
int win_width, win_height;
|
||||
|
||||
/* Output */
|
||||
bool vsync;
|
||||
@@ -59,6 +69,7 @@ struct demo_view_t {
|
||||
int height;
|
||||
};
|
||||
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
demo_view_t *
|
||||
demo_view_create (demo_renderer_t *renderer, GLFWwindow *window)
|
||||
{
|
||||
@@ -71,6 +82,25 @@ demo_view_create (demo_renderer_t *renderer, GLFWwindow *window)
|
||||
|
||||
return vu;
|
||||
}
|
||||
#endif
|
||||
|
||||
demo_view_t *
|
||||
demo_view_create_headless (demo_renderer_t *renderer,
|
||||
int fb_width, int fb_height,
|
||||
int win_width, int win_height)
|
||||
{
|
||||
demo_view_t *vu = (demo_view_t *) calloc (1, sizeof (demo_view_t));
|
||||
|
||||
vu->renderer = renderer;
|
||||
vu->fb_width = fb_width;
|
||||
vu->fb_height = fb_height;
|
||||
vu->win_width = win_width;
|
||||
vu->win_height = win_height;
|
||||
vu->needs_redraw = true;
|
||||
demo_view_reset (vu);
|
||||
|
||||
return vu;
|
||||
}
|
||||
|
||||
void
|
||||
demo_view_destroy (demo_view_t *vu)
|
||||
@@ -156,7 +186,11 @@ demo_view_apply_transform (demo_view_t *vu, float *mat, int width, int height)
|
||||
static double
|
||||
current_time (void)
|
||||
{
|
||||
#ifdef __EMSCRIPTEN__
|
||||
return emscripten_get_now () / 1000.0;
|
||||
#else
|
||||
return glfwGetTime ();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -237,9 +271,11 @@ demo_view_toggle_dark (demo_view_t *vu)
|
||||
vu->needs_redraw = true;
|
||||
}
|
||||
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
static void
|
||||
demo_view_toggle_fullscreen (demo_view_t *vu)
|
||||
{
|
||||
if (!vu->window) return;
|
||||
vu->fullscreen = !vu->fullscreen;
|
||||
if (vu->fullscreen) {
|
||||
glfwGetWindowPos (vu->window, &vu->x, &vu->y);
|
||||
@@ -251,12 +287,17 @@ demo_view_toggle_fullscreen (demo_view_t *vu)
|
||||
glfwSetWindowMonitor (vu->window, NULL, vu->x, vu->y, vu->width, vu->height, 0);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
void
|
||||
demo_view_reshape_func (demo_view_t *vu, int width, int height)
|
||||
{
|
||||
vu->fb_width = width;
|
||||
vu->fb_height = height;
|
||||
vu->win_width = width;
|
||||
vu->win_height = height;
|
||||
vu->needs_redraw = true;
|
||||
}
|
||||
|
||||
@@ -326,7 +367,10 @@ demo_view_key_func (demo_view_t *vu, int key, int scancode, int action, int mods
|
||||
{
|
||||
case GLFW_KEY_ESCAPE:
|
||||
case GLFW_KEY_Q:
|
||||
glfwSetWindowShouldClose (vu->window, GLFW_TRUE);
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
if (vu->window)
|
||||
glfwSetWindowShouldClose (vu->window, GLFW_TRUE);
|
||||
#endif
|
||||
break;
|
||||
|
||||
case GLFW_KEY_SPACE:
|
||||
@@ -346,9 +390,11 @@ demo_view_key_func (demo_view_t *vu, int key, int scancode, int action, int mods
|
||||
demo_view_toggle_vsync (vu);
|
||||
break;
|
||||
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
case GLFW_KEY_F:
|
||||
demo_view_toggle_fullscreen (vu);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case GLFW_KEY_R:
|
||||
demo_view_reset (vu);
|
||||
@@ -383,7 +429,10 @@ demo_view_mouse_func (demo_view_t *vu, int button, int action, int mods)
|
||||
vu->buttons &= ~(1 << button);
|
||||
vu->modifiers = mods;
|
||||
|
||||
glfwGetCursorPos (vu->window, &vu->cursorx, &vu->cursory);
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
if (vu->window)
|
||||
glfwGetCursorPos (vu->window, &vu->cursorx, &vu->cursory);
|
||||
#endif
|
||||
double x = vu->cursorx, y = vu->cursory;
|
||||
|
||||
switch (button)
|
||||
@@ -452,8 +501,11 @@ demo_view_motion_func (demo_view_t *vu, double x, double y)
|
||||
return;
|
||||
}
|
||||
|
||||
int width, height;
|
||||
glfwGetWindowSize (vu->window, &width, &height);
|
||||
int width = vu->win_width, height = vu->win_height;
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
if (vu->window)
|
||||
glfwGetWindowSize (vu->window, &width, &height);
|
||||
#endif
|
||||
|
||||
if (vu->buttons & (1 << GLFW_MOUSE_BUTTON_LEFT))
|
||||
{
|
||||
@@ -564,8 +616,11 @@ demo_view_display (demo_view_t *vu, demo_buffer_t *buffer)
|
||||
}
|
||||
}
|
||||
|
||||
int width, height;
|
||||
glfwGetFramebufferSize (vu->window, &width, &height);
|
||||
int width = vu->fb_width, height = vu->fb_height;
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
if (vu->window)
|
||||
glfwGetFramebufferSize (vu->window, &width, &height);
|
||||
#endif
|
||||
|
||||
float mat[16];
|
||||
|
||||
|
||||
@@ -13,8 +13,15 @@
|
||||
|
||||
typedef struct demo_view_t demo_view_t;
|
||||
|
||||
#ifndef HB_GPU_NO_GLFW
|
||||
demo_view_t *
|
||||
demo_view_create (demo_renderer_t *renderer, GLFWwindow *window);
|
||||
#endif
|
||||
|
||||
demo_view_t *
|
||||
demo_view_create_headless (demo_renderer_t *renderer,
|
||||
int fb_width, int fb_height,
|
||||
int win_width, int win_height);
|
||||
|
||||
void
|
||||
demo_view_destroy (demo_view_t *vu);
|
||||
|
||||
@@ -18,11 +18,13 @@ em++ \
|
||||
-DHB_NO_MT \
|
||||
-DHAVE_ROUND \
|
||||
-DHB_HAS_GPU \
|
||||
-DHB_GPU_NO_GLFW \
|
||||
-include gl-stub.h \
|
||||
"$SRCDIR/src/harfbuzz-world.cc" \
|
||||
"$SRCDIR/util/gpu/demo-atlas.cc" \
|
||||
"$SRCDIR/util/gpu/demo-buffer.cc" \
|
||||
"$SRCDIR/util/gpu/demo-font.cc" \
|
||||
"$SRCDIR/util/gpu/demo-view.cc" \
|
||||
"$SRCDIR/util/gpu/web/hb-gpu-web-webgpu.cc" \
|
||||
--use-port=emdawnwebgpu \
|
||||
-sALLOW_MEMORY_GROWTH=1 \
|
||||
|
||||
@@ -52,4 +52,39 @@ static inline GLint glGetUniformLocation (GLuint, const GLchar *) { return 0; }
|
||||
static inline void glUniform1i (GLint, GLint) {}
|
||||
static inline GLenum glGetError () { return 0; }
|
||||
|
||||
/* GLFW type and constant stubs */
|
||||
typedef void GLFWwindow;
|
||||
|
||||
#define GLFW_RELEASE 0
|
||||
#define GLFW_PRESS 1
|
||||
#define GLFW_REPEAT 2
|
||||
#define GLFW_TRUE 1
|
||||
#define GLFW_FALSE 0
|
||||
|
||||
#define GLFW_MOD_SHIFT 0x0001
|
||||
|
||||
#define GLFW_MOUSE_BUTTON_1 0
|
||||
#define GLFW_MOUSE_BUTTON_2 1
|
||||
#define GLFW_MOUSE_BUTTON_3 2
|
||||
#define GLFW_MOUSE_BUTTON_LEFT 0
|
||||
#define GLFW_MOUSE_BUTTON_RIGHT 1
|
||||
#define GLFW_MOUSE_BUTTON_MIDDLE 2
|
||||
|
||||
#define GLFW_KEY_SPACE 32
|
||||
#define GLFW_KEY_SLASH 47
|
||||
#define GLFW_KEY_0 48
|
||||
#define GLFW_KEY_9 57
|
||||
#define GLFW_KEY_A 65
|
||||
#define GLFW_KEY_B 66
|
||||
#define GLFW_KEY_F 70
|
||||
#define GLFW_KEY_G 71
|
||||
#define GLFW_KEY_Q 81
|
||||
#define GLFW_KEY_R 82
|
||||
#define GLFW_KEY_V 86
|
||||
#define GLFW_KEY_ESCAPE 256
|
||||
#define GLFW_KEY_RIGHT 262
|
||||
#define GLFW_KEY_LEFT 263
|
||||
#define GLFW_KEY_DOWN 264
|
||||
#define GLFW_KEY_UP 265
|
||||
|
||||
#endif /* GL_STUB_H */
|
||||
+335
-510
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user