1 files changed, 14 insertions, 34 deletions

diff --git a/examples/hello.c b/examples/hello.c
index 054051d..d17dd39 100644
--- a/examples/hello.c
+++ b/examples/hello.c
@@ -1,50 +1,30 @@
 /* A CPU-rendered window. */
 #include <yasl/yasl.h>
-#include <yasl/cpu.h>
 
 int main(void)
 {
-    struct yasl_surface_options options = {
-        .title = "Hello YASL",
-        .width = 640,
-        .height = 480,
-        .type = YASL_SURFACE_CPU,
-    };
-    yasl_surface *surface = yasl_surface_create(&options);
+    yasl_surface *surface = yasl_surface_create(
+        &(struct yasl_surface_options){.title = "Hello YASL", .width = 640, .height = 480});
     if (!surface)
         return 1;
-
-    int result = 0;
-    for (;;) {
-        yasl_event event;
-        if (yasl_wait_event(&event, -1) < 0) {
-            result = 1;
-            break;
-        }
+    yasl_event event;
+    while (yasl_wait_event(&event, -1) >= 0) {
         if (event.type == YASL_EVENT_CLOSE || event.type == YASL_EVENT_QUIT)
             break;
         if (event.type != YASL_EVENT_REFRESH)
             continue;
-
-        struct yasl_cpu_buffer buffer;
-        if (yasl_cpu_acquire(surface, &buffer) < 0) {
-            result = 1;
+        int w, h;
+        uint32_t *pixels = yasl_cpu_pixels(surface, &w, &h);
+        if (!pixels)
             break;
-        }
-        for (int y = 0; y < buffer.height; y++) {
-            uint32_t *row = (uint32_t *)((unsigned char *)buffer.pixels + y * buffer.stride_bytes);
-            for (int x = 0; x < buffer.width; x++) {
+        for (int y = 0; y < h; y++)
+            for (int x = 0; x < w; x++) {
                 /* Opaque premultiplied ARGB: red grows rightward, green downward. */
-                uint32_t r = (uint32_t)(x * 255 / (buffer.width > 1 ? buffer.width - 1 : 1));
-                uint32_t g = (uint32_t)(y * 255 / (buffer.height > 1 ? buffer.height - 1 : 1));
-                row[x] = 0xff000000 | r << 16 | g << 8 | (255 - r);
+                uint32_t r = (uint32_t)(x * 255 / (w > 1 ? w - 1 : 1));
+                uint32_t g = (uint32_t)(y * 255 / (h > 1 ? h - 1 : 1));
+                pixels[(size_t)y * w + x] = 0xff000000 | r << 16 | g << 8 | (255 - r);
             }
-        }
-        if (yasl_cpu_present(surface, &buffer) < 0) {
-            result = 1;
-            break;
-        }
+        yasl_cpu_present(surface);
     }
-    yasl_shutdown();
-    return result;
+    return yasl_shutdown() < 0;
 }