/* for 3d texture */
#define COGL_ENABLE_EXPERIMENTAL_API
+#define CLUTTER_ENABLE_EXPERIMENTAL_API
#include <clutter/clutter.h>
cogl_shader_source (shader,
"vec3 checker(vec2 texc, vec3 color0, vec3 color1) \n"
"{ \n"
- " if (mod(int(floor(texc.x) + floor(texc.y)), 2) == 0) \n"
+ " if (mod(floor(texc.x) + floor(texc.y), 2.0) == 0.0) \n"
" return color0; \n"
" else \n"
" return color1; \n"
" \n"
"void main(void) \n"
"{ \n"
- " vec3 bg = checker(gl_FragCoord.xy / 16, vec3(0.6, 0.6, 0.6), vec3(0.4, 0.4, 0.4)); \n"
+ " vec3 bg = checker(gl_FragCoord.xy / 16.0, vec3(0.6, 0.6, 0.6), vec3(0.4, 0.4, 0.4)); \n"
" vec4 img4 = texture2D(tex, gl_TexCoord[0].xy); \n"
- " vec3 img3 = img4.rgb; \n"
+ " vec3 img3 = img4.bgr; \n"
" img3 = img3 * scale + offset; \n"
- " img3 = texture3D(clut, img3); \n"
+ " img3 = texture3D(clut, img3).rgb; \n"
" \n"
" gl_FragColor = vec4(img3 * img4.a + bg * (1.0 - img4.a), 1.0); \n"
"} \n"
);
cogl_shader_compile(shader);
gchar *err = cogl_shader_get_info_log(shader);
- printf("%s\n",err);
+ DEBUG_0("%s\n",err);
g_free(err);
program = cogl_create_program ();
DEBUG_0("%s clut start", get_exec_time());
- for (r = 0; r < CLUT_SIZE; r++)
+ for (r = 0; r < CLUT_SIZE; r++)
{
- for (g = 0; g < CLUT_SIZE; g++)
+ for (g = 0; g < CLUT_SIZE; g++)
{
- for (b = 0; b < CLUT_SIZE; b++)
+ for (b = 0; b < CLUT_SIZE; b++)
{
guchar *ptr = clut + ((b * CLUT_SIZE + g) * CLUT_SIZE + r) * 3;
ptr[0] = floor ((double) r / (CLUT_SIZE - 1) * 255.0 + 0.5);
g_object_unref(tmp_pixbuf);
DEBUG_0("%s clut upload start", get_exec_time());
-
+#if CLUTTER_CHECK_VERSION(1,10,0)
+ {
+ CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ());
+
+ tex3d = cogl_texture_3d_new_from_data(ctx,
+ CLUT_SIZE, CLUT_SIZE, CLUT_SIZE,
+ COGL_PIXEL_FORMAT_RGB_888,
+ COGL_PIXEL_FORMAT_RGB_888,
+ CLUT_SIZE * 3,
+ CLUT_SIZE * CLUT_SIZE * 3,
+ clut,
+ NULL);
+ }
+#else
tex3d = cogl_texture_3d_new_from_data(CLUT_SIZE, CLUT_SIZE, CLUT_SIZE,
COGL_TEXTURE_NONE,
COGL_PIXEL_FORMAT_RGB_888,
CLUT_SIZE * CLUT_SIZE * 3,
clut,
NULL);
- material = clutter_texture_get_cogl_material(rc->texture);
+#endif
+ material = clutter_texture_get_cogl_material(CLUTTER_TEXTURE(rc->texture));
cogl_material_set_layer(material, 1, tex3d);
cogl_handle_unref(tex3d);
DEBUG_0("%s clut end", get_exec_time());
clutter_actor_set_anchor_point(CLUTTER_ACTOR(rc->texture), 0, 0);
- printf("scale %d %d\n", rc->pr->width, rc->pr->height);
- printf("pos %d %d\n", rc->pr->x_offset, rc->pr->y_offset);
+ DEBUG_0("scale %d %d", rc->pr->width, rc->pr->height);
+ DEBUG_0("pos %d %d", rc->pr->x_offset, rc->pr->y_offset);
- clutter_actor_set_scale(CLUTTER_ACTOR(rc->texture),
+ clutter_actor_set_scale(CLUTTER_ACTOR(rc->texture),
(gfloat)pr->width / pr->image_width,
(gfloat)pr->height / pr->image_height);
break;
}
- clutter_actor_set_position(CLUTTER_ACTOR(rc->texture),
- pr->x_offset - pr->x_scroll + anchor_x,
+ clutter_actor_set_position(CLUTTER_ACTOR(rc->texture),
+ pr->x_offset - pr->x_scroll + anchor_x,
pr->y_offset - pr->y_scroll + anchor_y);
}
-static void renderer_area_clip_add(RendererClutter *rc, gfloat x, gfloat y, gfloat w, gfloat h)
+static void rc_area_clip_add(RendererClutter *rc, gfloat x, gfloat y, gfloat w, gfloat h)
{
- PixbufRenderer *pr = rc->pr;
gfloat x2, y2;
gfloat clip_x, clip_y, clip_w, clip_h, clip_x2, clip_y2;
clip_w = clip_x2 - clip_x;
clip_h = clip_y2 - clip_y;
- printf("clip %f %f %f %f\n", clip_x, clip_y, clip_w, clip_h);
clutter_actor_set_clip(rc->texture, clip_x, clip_y, clip_w, clip_h);
}
#define MAX_REGION_AREA (32768 * 1024)
-static gboolean renderer_area_changed_cb(gpointer data);
+static gboolean rc_area_changed_cb(gpointer data);
static void rc_schedule_texture_upload(RendererClutter *rc)
{
if (g_get_monotonic_time() - rc->last_pixbuf_change < 50000)
{
- /* delay clutter redraw until the texture has some data
+ /* delay clutter redraw until the texture has some data
set priority between gtk redraw and clutter redraw */
- rc->idle_update = g_idle_add_full(CLUTTER_PRIORITY_REDRAW - 10, renderer_area_changed_cb, rc, NULL);
+ DEBUG_0("%s tex upload high prio", get_exec_time());
+ rc->idle_update = g_idle_add_full(CLUTTER_PRIORITY_REDRAW - 10, rc_area_changed_cb, rc, NULL);
}
else
{
/* higher prio than histogram */
- rc->idle_update = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE - 5, renderer_area_changed_cb, rc, NULL);
+ DEBUG_0("%s tex upload low prio", get_exec_time());
+
+ rc->idle_update = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE - 5, rc_area_changed_cb, rc, NULL);
}
}
-static gboolean renderer_area_changed_cb(gpointer data)
+static gboolean rc_area_changed_cb(gpointer data)
{
RendererClutter *rc = (RendererClutter *)data;
PixbufRenderer *pr = rc->pr;
if (h > par->h) h = par->h;
- printf("renderer_area_changed_cb %d %d %d %d (%d)\n", par->x, par->y, par->w, h, par->h);
DEBUG_0("%s upload start", get_exec_time());
if (pr->pixbuf)
{
h,
par->w,
h,
- gdk_pixbuf_get_has_alpha(pr->pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
+ gdk_pixbuf_get_has_alpha(pr->pixbuf) ? COGL_PIXEL_FORMAT_BGRA_8888 : COGL_PIXEL_FORMAT_BGR_888,
gdk_pixbuf_get_rowstride(pr->pixbuf),
gdk_pixbuf_get_pixels(pr->pixbuf));
}
DEBUG_0("%s upload end", get_exec_time());
- renderer_area_clip_add(rc, par->x, par->y, par->w, h);
+ rc_area_clip_add(rc, par->x, par->y, par->w, h);
par->y += h;
}
-static void renderer_area_changed(void *renderer, gint src_x, gint src_y, gint src_w, gint src_h)
+static void rc_area_changed(void *renderer, gint src_x, gint src_y, gint src_w, gint src_h)
{
RendererClutter *rc = (RendererClutter *)renderer;
PixbufRenderer *pr = rc->pr;
gint width = gdk_pixbuf_get_width(pr->pixbuf);
gint height = gdk_pixbuf_get_height(pr->pixbuf);
- if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS)
+ if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS)
{
width /= 2;
}
par->w = src_w;
par->h = src_h;
rc->pending_updates = g_list_append(rc->pending_updates, par);
- if (!rc->idle_update)
+ if (!rc->idle_update)
{
rc_schedule_texture_upload(rc);
}
}
-static void renderer_remove_pending_updates(RendererClutter *rc)
+static void rc_remove_pending_updates(RendererClutter *rc)
{
if (rc->idle_update) g_idle_remove_by_data(rc);
rc->idle_update = 0;
}
}
-static void renderer_update_pixbuf(void *renderer, gboolean lazy)
+static void rc_update_pixbuf(void *renderer, gboolean lazy)
{
RendererClutter *rc = (RendererClutter *)renderer;
PixbufRenderer *pr = rc->pr;
- renderer_remove_pending_updates(rc);
+ DEBUG_0("rc_update_pixbuf");
+
+ rc_remove_pending_updates(rc);
+
+ rc->last_pixbuf_change = g_get_monotonic_time();
+ DEBUG_0("%s change time reset", get_exec_time());
if (pr->pixbuf)
{
gint width = gdk_pixbuf_get_width(pr->pixbuf);
gint height = gdk_pixbuf_get_height(pr->pixbuf);
+
+ DEBUG_0("pixbuf size %d x %d (%d)", width, height, gdk_pixbuf_get_has_alpha(pr->pixbuf) ? 32 : 24);
gint prev_width, prev_height;
- if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS)
+ if (pr->stereo_data == STEREO_PIXBUF_SBS || pr->stereo_data == STEREO_PIXBUF_CROSS)
{
width /= 2;
}
- printf("renderer_update_pixbuf\n");
clutter_texture_get_base_size(CLUTTER_TEXTURE(rc->texture), &prev_width, &prev_height);
- printf("change from %d %d to %d %d\n", prev_width, prev_height, width, height);
if (width != prev_width || height != prev_height)
{
/* FIXME use CoglMaterial with multiple textures for background, color management, anaglyph, ... */
CoglHandle texture = cogl_texture_new_with_size(width,
height,
- COGL_TEXTURE_NO_AUTO_MIPMAP,
- gdk_pixbuf_get_has_alpha(pr->pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888);
+ COGL_TEXTURE_NO_AUTO_MIPMAP | COGL_TEXTURE_NO_SLICING,
+ gdk_pixbuf_get_has_alpha(pr->pixbuf) ? COGL_PIXEL_FORMAT_BGRA_8888 : COGL_PIXEL_FORMAT_BGR_888);
if (texture != COGL_INVALID_HANDLE)
{
clutter_actor_set_clip(rc->texture, 0, 0, 0, 0); /* visible area is extended as area_changed events arrive */
if (!lazy)
{
- renderer_area_changed(renderer, GET_RIGHT_PIXBUF_OFFSET(rc), 0, width, height);
+ rc_area_changed(renderer, GET_RIGHT_PIXBUF_OFFSET(rc), 0, width, height);
}
}
rc->clut_updated = FALSE;
- rc->last_pixbuf_change = g_get_monotonic_time();
- printf("renderer_update_pixbuf\n");
- rc_sync_actor(rc);
}
-static void renderer_update_zoom(void *renderer, gboolean lazy)
+static void rc_update_zoom(void *renderer, gboolean lazy)
{
RendererClutter *rc = (RendererClutter *)renderer;
- PixbufRenderer *pr = rc->pr;
- printf("renderer_update_zoom\n");
+ DEBUG_0("rc_update_zoom");
rc_sync_actor(rc);
}
-static void renderer_invalidate_region(void *renderer, gint x, gint y, gint w, gint h)
+static void rc_invalidate_region(void *renderer, gint x, gint y, gint w, gint h)
{
}
}
}
-
-static void renderer_overlay_draw(void *renderer, gint x, gint y, gint w, gint h)
-{
-}
-
-static gint renderer_overlay_add(void *renderer, GdkPixbuf *pixbuf, gint x, gint y, OverlayRendererFlags flags)
+static gint rc_overlay_add(void *renderer, GdkPixbuf *pixbuf, gint x, gint y, OverlayRendererFlags flags)
{
RendererClutter *rc = (RendererClutter *)renderer;
PixbufRenderer *pr = rc->pr;
return od->id;
}
-static void renderer_overlay_set(void *renderer, gint id, GdkPixbuf *pixbuf, gint x, gint y)
+static void rc_overlay_set(void *renderer, gint id, GdkPixbuf *pixbuf, gint x, gint y)
{
RendererClutter *rc = (RendererClutter *)renderer;
PixbufRenderer *pr = rc->pr;
}
}
-static gboolean renderer_overlay_get(void *renderer, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
+static gboolean rc_overlay_get(void *renderer, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
{
RendererClutter *rc = (RendererClutter *)renderer;
}
-static void renderer_update_sizes(void *renderer)
+static void rc_update_viewport(void *renderer)
{
RendererClutter *rc = (RendererClutter *)renderer;
- ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff };
+ ClutterColor stage_color = { 0x00, 0x00, 0x00, 0xff };
rc->stereo_off_x = 0;
rc->stereo_off_y = 0;
- if (rc->stereo_mode & PR_STEREO_RIGHT)
+ if (rc->stereo_mode & PR_STEREO_RIGHT)
{
- if (rc->stereo_mode & PR_STEREO_HORIZ)
+ if (rc->stereo_mode & PR_STEREO_HORIZ)
{
rc->stereo_off_x = rc->pr->viewport_width;
}
- else if (rc->stereo_mode & PR_STEREO_VERT)
+ else if (rc->stereo_mode & PR_STEREO_VERT)
{
rc->stereo_off_y = rc->pr->viewport_height;
}
- else if (rc->stereo_mode & PR_STEREO_FIXED)
+ else if (rc->stereo_mode & PR_STEREO_FIXED)
{
rc->stereo_off_x = rc->pr->stereo_fixed_x_right;
rc->stereo_off_y = rc->pr->stereo_fixed_y_right;
}
else
{
- if (rc->stereo_mode & PR_STEREO_FIXED)
+ if (rc->stereo_mode & PR_STEREO_FIXED)
{
rc->stereo_off_x = rc->pr->stereo_fixed_x_left;
rc->stereo_off_y = rc->pr->stereo_fixed_y_left;
}
}
- DEBUG_1("update size: %p %d %d %d %d", rc, rc->stereo_off_x, rc->stereo_off_y, rc->pr->viewport_width, rc->pr->viewport_height);
-
- printf("renderer_update_sizes scale %d %d\n", rc->pr->width, rc->pr->height);
+ DEBUG_0("rc_update_viewport scale %d %d", rc->pr->width, rc->pr->height);
clutter_stage_set_color(CLUTTER_STAGE(rc->stage), &stage_color);
clutter_actor_set_rotation(CLUTTER_ACTOR(rc->group),
CLUTTER_Y_AXIS,
- (rc->stereo_mode & PR_STEREO_MIRROR) ? 180 : 0,
+ (rc->stereo_mode & PR_STEREO_MIRROR) ? 180 : 0,
rc->pr->viewport_width / 2.0, 0, 0);
clutter_actor_set_rotation(CLUTTER_ACTOR(rc->group),
rc_overlay_update_positions(rc);
}
-static void renderer_scroll(void *renderer, gint x_off, gint y_off)
+static void rc_scroll(void *renderer, gint x_off, gint y_off)
{
- printf("renderer_scroll\n");
+ DEBUG_0("rc_scroll");
RendererClutter *rc = (RendererClutter *)renderer;
- PixbufRenderer *pr = rc->pr;
rc_sync_actor(rc);
}
-static void renderer_stereo_set(void *renderer, gint stereo_mode)
+static void rc_stereo_set(void *renderer, gint stereo_mode)
{
RendererClutter *rc = (RendererClutter *)renderer;
rc->stereo_mode = stereo_mode;
}
-static void renderer_free(void *renderer)
+static void rc_free(void *renderer)
{
RendererClutter *rc = (RendererClutter *)renderer;
GtkWidget *widget = gtk_bin_get_child(GTK_BIN(rc->pr));
- renderer_remove_pending_updates(rc);
+ rc_remove_pending_updates(rc);
rc_overlay_free_all(rc);
clutter_actor_destroy(rc->group);
if (clutter_group_get_n_children(CLUTTER_GROUP(rc->stage)) == 0)
{
- printf("destroy %p\n", rc->widget);
+ DEBUG_1("destroy %p", rc->widget);
/* this was the last user */
gtk_widget_destroy(rc->widget);
}
else
{
- printf("keep %p\n", rc->widget);
+ DEBUG_1("keep %p", rc->widget);
g_object_unref(G_OBJECT(rc->widget));
}
}
rc->pr = pr;
- rc->f.area_changed = renderer_area_changed;
- rc->f.update_pixbuf = renderer_update_pixbuf;
- rc->f.free = renderer_free;
- rc->f.update_zoom = renderer_update_zoom;
- rc->f.invalidate_region = renderer_invalidate_region;
- rc->f.scroll = renderer_scroll;
- rc->f.update_sizes = renderer_update_sizes;
+ rc->f.area_changed = rc_area_changed;
+ rc->f.update_pixbuf = rc_update_pixbuf;
+ rc->f.free = rc_free;
+ rc->f.update_zoom = rc_update_zoom;
+ rc->f.invalidate_region = rc_invalidate_region;
+ rc->f.scroll = rc_scroll;
+ rc->f.update_viewport = rc_update_viewport;
- rc->f.overlay_add = renderer_overlay_add;
- rc->f.overlay_set = renderer_overlay_set;
- rc->f.overlay_get = renderer_overlay_get;
- rc->f.overlay_draw = renderer_overlay_draw;
+ rc->f.overlay_add = rc_overlay_add;
+ rc->f.overlay_set = rc_overlay_set;
+ rc->f.overlay_get = rc_overlay_get;
- rc->f.stereo_set = renderer_stereo_set;
+ rc->f.stereo_set = rc_stereo_set;
rc->stereo_mode = 0;
return NULL;
}
}
- else
+ else
{
rc->widget = gtk_clutter_embed_new();
gtk_container_add(GTK_CONTAINER(rc->pr), rc->widget);
rc->texture = clutter_texture_new ();
clutter_container_add_actor(CLUTTER_CONTAINER(rc->group), rc->texture);
- rc_set_shader(clutter_texture_get_cogl_material(rc->texture));
+ rc_set_shader(clutter_texture_get_cogl_material(CLUTTER_TEXTURE(rc->texture)));
g_object_ref(G_OBJECT(rc->widget));
gtk_widget_show(rc->widget);
return (RendererFuncs *) rc;
}
-#endif
+#endif
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff