ray 0.1.1 → 0.2.0

data/ext/say_osx_window.h

@@ -3,7 +3,7 @@
 void say_osx_flip_pool() {
   static say_thread_variable *var = NULL;
   if (!var) {
-    var = say_thread_variable_create(NULL);
+    var = say_thread_variable_create();
   }
 
   NSAutoreleasePool *pool = say_thread_variable_get(var);
@@ -59,7 +59,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev);
   if (!(self = [super init]))
     return nil;
 
-  events = say_array_create(sizeof(say_event), NULL, NULL);
+  mo_array_init(&events, sizeof(say_event));
   return self;
 }
 
@@ -67,11 +67,6 @@ static uint8_t say_osx_convert_mod(NSEvent *ev);
                 width:(size_t)w
                height:(size_t)h
                 style:(uint8_t)style {
-  if ([NSThread currentThread] != [NSThread mainThread]) {
-    say_error_set("can't create window outside main thread");
-    return NO;
-  }
-
   say_osx_setup_process();
 
   NSRect rect = NSMakeRect(0, 0, w, h);
@@ -174,11 +169,9 @@ static uint8_t say_osx_convert_mod(NSEvent *ev);
 
                                               bitsPerPixel:0];
 
-
-  say_color *buf = say_image_get_buffer(img);
   for (size_t y = 0; y < h; y++) {
     for (size_t x = 0; x < w; x++) {
-      say_color col = buf[x + y * w];
+      say_color col = say_image_get(img, x, y);
       NSUInteger pixel[] = {col.r, col.g, col.b, col.a};
 
       [rep setPixel:pixel atX:x y:y];
@@ -226,7 +219,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev);
     say_event ev;
     ev.type = SAY_EVENT_RESIZE;
     ev.ev.resize.size = say_make_vector2(w, h);
-    say_array_push(events, &ev);
+    mo_array_push(&events, &ev);
   }
   else {
     NSRect frame = view.frame;
@@ -243,10 +236,12 @@ static uint8_t say_osx_convert_mod(NSEvent *ev);
 
 - (void)close {
   if (window) {
-     allow_close = YES;
+    allow_close = YES;
     [window close];
     [window release];
     window = nil;
+
+    mo_array_resize(&events, 0);
   }
 }
 
@@ -255,7 +250,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev);
 
   [self close];
   [view release];
-  say_array_free(events);
+  mo_array_release(&events);
   [super dealloc];
 
   say_osx_flip_pool();
@@ -319,9 +314,9 @@ static NSEvent *say_osx_get_event(bool patient) {
   }
   [pool drain];
 
-  if (say_array_get_size(events) != 0) {
-    *ev = *(say_event*)say_array_get(events, 0);
-    say_array_delete(events, 0);
+  if (events.size != 0) {
+    *ev = mo_array_get_as(&events, 0, say_event);
+    mo_array_delete(&events, 0);
 
     return YES;
   }
@@ -336,14 +331,14 @@ static NSEvent *say_osx_get_event(bool patient) {
 
   NSAutoreleasePool *pool = [NSAutoreleasePool new];
 
-  while (say_array_get_size(events) == 0 && (nsev = say_osx_get_event(true))) {
+  while (events.size == 0 && (nsev = say_osx_get_event(true))) {
     [NSApp sendEvent:nsev];
   }
 
   [pool drain];
 
-  *ev = *(say_event*)say_array_get(events, 0);
-  say_array_delete(events, 0);
+  *ev = mo_array_get_as(&events, 0, say_event);
+  mo_array_delete(&events, 0);
 }
 
 static say_key say_osx_convert_key(NSEvent *ev) {
@@ -480,7 +475,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
     ev.ev.key.mod         = say_osx_convert_mod(nsev);
     ev.ev.key.native_code = nsev.keyCode;
 
-    say_array_push(events, &ev);
+    mo_array_push(&events, &ev);
   }
 
   NSText *text = [window fieldEditor:YES forObject:self];
@@ -491,7 +486,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
     ev.type = SAY_EVENT_TEXT_ENTERED;
     ev.ev.text.text = [text.string characterAtIndex:0];
 
-    say_array_push(events, &ev);
+    mo_array_push(&events, &ev);
 
     text.string = @"";
   }
@@ -505,7 +500,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.ev.key.mod         = say_osx_convert_mod(nsev);
   ev.ev.key.native_code = nsev.keyCode;
 
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)submitFlagChange:(uint8_t)mod forKey:(say_key)key
@@ -517,7 +512,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.ev.key.mod         = mod;
   ev.ev.key.native_code = 0;
 
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)flagsChanged:(NSEvent*)nsev {
@@ -578,7 +573,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.type = SAY_EVENT_BUTTON_PRESS;
   ev.ev.button.pos = [self convertPoint:nsev.locationInWindow];
   ev.ev.button.button = SAY_BUTTON_LEFT;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)ownMouseUp:(NSEvent*)nsev {
@@ -586,7 +581,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.type = SAY_EVENT_BUTTON_RELEASE;
   ev.ev.button.pos = [self convertPoint:nsev.locationInWindow];
   ev.ev.button.button = SAY_BUTTON_LEFT;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)ownRightMouseDown:(NSEvent*)nsev {
@@ -594,7 +589,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.type = SAY_EVENT_BUTTON_PRESS;
   ev.ev.button.pos = [self convertPoint:nsev.locationInWindow];
   ev.ev.button.button = SAY_BUTTON_RIGHT;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)ownRightMouseUp:(NSEvent*)nsev {
@@ -602,7 +597,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.type = SAY_EVENT_BUTTON_RELEASE;
   ev.ev.button.pos = [self convertPoint:nsev.locationInWindow];
   ev.ev.button.button = SAY_BUTTON_RIGHT;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 /* Assume other mouse button will be middle. */
@@ -611,7 +606,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.type = SAY_EVENT_BUTTON_PRESS;
   ev.ev.button.pos = [self convertPoint:nsev.locationInWindow];
   ev.ev.button.button = SAY_BUTTON_MIDDLE;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)ownOtherMouseUp:(NSEvent*)nsev {
@@ -619,26 +614,26 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.type = SAY_EVENT_BUTTON_RELEASE;
   ev.ev.button.pos = [self convertPoint:nsev.locationInWindow];
   ev.ev.button.button = SAY_BUTTON_MIDDLE;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)mouseMoved:(NSEvent*)nsev {
   say_event ev;
   ev.type = SAY_EVENT_MOUSE_MOTION;
   ev.ev.motion.pos = [self convertPoint:nsev.locationInWindow];
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)mouseEntered:(NSEvent*)nsev {
   say_event ev;
   ev.type = SAY_EVENT_MOUSE_ENTERED;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)mouseExited:(NSEvent*)nsev {
   say_event ev;
   ev.type = SAY_EVENT_MOUSE_LEFT;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)ownScrollWheel:(NSEvent*)nsev {
@@ -649,7 +644,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
   ev.type = SAY_EVENT_WHEEL_MOTION;
   ev.ev.wheel.pos = [self convertPoint:nsev.locationInWindow];
   ev.ev.wheel.delta = nsev.deltaY;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 /*
@@ -659,7 +654,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
 - (BOOL)windowShouldClose:(id)sender {
   say_event ev;
   ev.type = SAY_EVENT_QUIT;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 
   if (allow_close) {
     allow_close = NO;
@@ -672,13 +667,13 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
 - (void)windowDidBecomeKey:(NSNotification*)not {
   say_event ev;
   ev.type = SAY_EVENT_FOCUS_GAIN;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)windowDidResignKey:(NSNotification*)not {
   say_event ev;
   ev.type = SAY_EVENT_FOCUS_LOSS;
-  say_array_push(events, &ev);
+  mo_array_push(&events, &ev);
 }
 
 - (void)windowDidResize:(NSNotification*)not {
@@ -689,7 +684,7 @@ static uint8_t say_osx_convert_mod(NSEvent *ev) {
     say_event ev;
     ev.type = SAY_EVENT_RESIZE;
     ev.ev.resize.size = say_make_vector2(size.width, size.height);
-    say_array_push(events, &ev);
+    mo_array_push(&events, &ev);
   }
 
   [view removeTrackingRect:track];

data/ext/say_pixel_bus.c

@@ -0,0 +1,163 @@
+#include "say.h"
+
+static say_context *say_pack_pbo_last_context = NULL;
+static GLuint       say_pack_pbo              = 0;
+
+static void say_pack_pbo_make_current(GLuint pbo) {
+  say_context *context = say_context_current();
+  if (say_pack_pbo_last_context != context ||
+      pbo != say_pack_pbo) {
+    say_pack_pbo              = pbo;
+    say_pack_pbo_last_context = context;
+
+    glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo);
+  }
+}
+
+static say_context *say_unpack_pbo_last_context = NULL;
+static GLuint       say_unpack_pbo              = 0;
+
+static void say_unpack_pbo_make_current(GLuint pbo) {
+  say_context *context = say_context_current();
+  if (say_unpack_pbo_last_context != context ||
+      pbo != say_unpack_pbo) {
+    say_unpack_pbo              = pbo;
+    say_unpack_pbo_last_context = context;
+
+    glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pbo);
+  }
+}
+
+static void say_pbo_will_delete(GLuint pbo) {
+  if (say_pack_pbo   == pbo) say_pack_pbo   = 0;
+  if (say_unpack_pbo == pbo) say_unpack_pbo = 0;
+}
+
+bool say_pixel_bus_is_available() {
+  say_context_ensure();
+  return GLEW_ARB_pixel_buffer_object ||
+    GLEW_VERSION_2_1;
+}
+
+say_pixel_bus *say_pixel_bus_create(GLenum mode) {
+  say_context_ensure();
+
+  say_pixel_bus *bus = malloc(sizeof(say_pixel_bus));
+
+  glGenBuffers(1, &bus->pbo);
+
+  bus->size = 1024;
+  bus->mode = mode;
+
+  say_pixel_bus_bind_pack(bus);
+  glBufferData(GL_PIXEL_PACK_BUFFER, 1024 * sizeof(say_color), NULL,
+               mode);
+
+  return bus;
+}
+
+void say_pixel_bus_free(say_pixel_bus *bus) {
+  say_context_ensure();
+  say_pbo_will_delete(bus->pbo);
+  glDeleteBuffers(1, &bus->pbo);
+  free(bus);
+}
+
+size_t say_pixel_bus_pull_image(say_pixel_bus *bus,
+                                say_image *img, size_t offset) {
+  say_image_bind(img);
+  say_pixel_bus_bind_pack(bus);
+
+  glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+                (void*)(offset * sizeof(say_color)));
+  return offset + say_image_get_width(img) * say_image_get_height(img);
+}
+
+size_t say_pixel_bus_pull_target(say_pixel_bus *bus,
+                                 say_target *target, size_t offset,
+                                 size_t x, size_t y, size_t w, size_t h) {
+  if (!say_target_make_current(target))
+    return offset + w * h;
+
+  say_pixel_bus_bind_pack(bus);
+
+  glReadPixels(x, target->size.y - y - h, w, h, GL_RGBA,
+               GL_UNSIGNED_BYTE, (void*)(offset * sizeof(say_color)));
+  return offset + w * h;
+}
+
+void say_pixel_bus_push_image(say_pixel_bus *bus,
+                                say_image *img, size_t offset,
+                                size_t x, size_t y, size_t w, size_t h) {
+  say_image_bind(img);
+  say_pixel_bus_bind_unpack(bus);
+
+  glTexSubImage2D(GL_TEXTURE_2D, 0,
+                  x, y, w, h,
+                  GL_RGBA, GL_UNSIGNED_BYTE,
+                  (void*)(offset * sizeof(say_color)));
+  say_image_mark_out_of_date(img);
+}
+
+void say_pixel_bus_bind_pack(say_pixel_bus *bus) {
+  say_context_ensure();
+  say_pack_pbo_make_current(bus->pbo);
+}
+
+void say_pixel_bus_bind_unpack(say_pixel_bus *bus) {
+  say_context_ensure();
+  say_unpack_pbo_make_current(bus->pbo);
+}
+
+void say_pixel_bus_unbind_pack() {
+  if (say_pixel_bus_is_available()) say_pack_pbo_make_current(0);
+}
+
+void say_pixel_bus_unbind_unpack() {
+  if (say_pixel_bus_is_available()) say_unpack_pbo_make_current(0);
+}
+
+void say_pixel_bus_bind(say_pixel_bus *bus) {
+  say_pixel_bus_bind_pack(bus);
+  say_pixel_bus_bind_unpack(bus);
+}
+
+void say_pixel_bus_unbind() {
+  say_pixel_bus_unbind_pack();
+  say_pixel_bus_unbind_unpack();
+}
+
+void say_pixel_bus_resize(say_pixel_bus *bus, size_t new_size) {
+  /* This is slow, so better not go through this for no reason. */
+  if (bus->size == new_size) return;
+
+  say_pixel_bus_bind_pack(bus);
+
+  void *buffer = malloc(sizeof(say_color) * new_size);
+  glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, new_size, buffer);
+
+  glBufferData(GL_PIXEL_PACK_BUFFER, new_size * sizeof(say_color),
+               buffer, bus->mode);
+
+  free(buffer);
+
+  bus->size = new_size;
+}
+
+void say_pixel_bus_resize_fast(say_pixel_bus *bus, size_t new_size) {
+  if (bus->size == new_size) return;
+
+  say_pixel_bus_bind_pack(bus);
+  glBufferData(GL_PIXEL_PACK_BUFFER, new_size * sizeof(say_color), NULL,
+               bus->mode);
+
+  bus->size = new_size;
+}
+
+size_t say_pixel_bus_get_size(say_pixel_bus *bus) {
+  return bus->size;
+}
+
+GLuint say_pixel_bus_get_pbo(say_pixel_bus *bus) {
+  return bus->pbo;
+}

data/ext/say_pixel_bus.h

@@ -0,0 +1,44 @@
+#ifndef SAY_PIXEL_BUS_H_
+#define SAY_PIXEL_BUS_H_
+
+#include "say_target.h"
+#include "say_image.h"
+
+typedef struct say_pixel_bus {
+  GLuint pbo;
+  size_t size;
+  GLenum mode;
+} say_pixel_bus;
+
+bool say_pixel_bus_is_available();
+
+say_pixel_bus *say_pixel_bus_create(GLenum mode);
+void say_pixel_bus_free(say_pixel_bus *bus);
+
+size_t say_pixel_bus_pull_image(say_pixel_bus *bus,
+                                say_image *img, size_t offset);
+size_t say_pixel_bus_pull_target(say_pixel_bus *bus,
+                                 say_target *target, size_t offset,
+                                 size_t x, size_t y, size_t w, size_t h);
+
+void say_pixel_bus_push_image(say_pixel_bus *bus,
+                              say_image *img, size_t offset,
+                              size_t x, size_t y, size_t w, size_t h);
+
+void say_pixel_bus_bind_pack(say_pixel_bus *bus);
+void say_pixel_bus_bind_unpack(say_pixel_bus *bus);
+
+void say_pixel_bus_unbind_pack();
+void say_pixel_bus_unbind_unpack();
+
+void say_pixel_bus_bind(say_pixel_bus *bus);
+void say_pixel_bus_unbind();
+
+void say_pixel_bus_resize(say_pixel_bus *bus, size_t new_size);
+void say_pixel_bus_resize_fast(say_pixel_bus *bus, size_t new_size);
+
+size_t say_pixel_bus_get_size(say_pixel_bus *bus);
+
+GLuint say_pixel_bus_get_pbo(say_pixel_bus *bus);
+
+#endif