e9f721216e
When splitting out the CoglPath api we saw that we would be left with inconsistent drawing apis if the drawing apis in core Cogl were lumped into the cogl_framebuffer_ api considering other Cogl sub-libraries or that others will want to create higher level drawing apis outside of Cogl but can't use the same namespace. So that we can aim for a more consistent style this adds a cogl_primitive_draw() api, comparable to cogl_path_fill() or cogl_pango_show_layout() that's intended to replace cogl_framebuffer_draw_primitive() Note: the attribute and rectangle drawing apis are still in the cogl_framebuffer_ namespace and this might potentially change but in these cases there is no single object representing the thing being drawn so it seems a more reasonable they they live in the framebuffer namespace for now. Note: the cogl_framebuffer_draw_primitive() api isn't removed by this patch so it can more conveniently be cherry picked to the 1.16 branch so we can mark it deprecated for a short while. Even though it's marked as experimental api we know that there are people using the api so we'd like to give them a chance to switch to the new api. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 418912b93ff81a47f9b38114d05335ab76277c48) Conflicts: cogl-pango/cogl-pango-display-list.c cogl/Makefile.am cogl/cogl-framebuffer.c cogl/cogl-pipeline-layer-state.h cogl/cogl2-path.c cogl/driver/gl/cogl-clip-stack-gl.c
123 lines
3.2 KiB
C
123 lines
3.2 KiB
C
#include <cogl/cogl.h>
|
|
#include <glib.h>
|
|
#include <stdio.h>
|
|
|
|
typedef struct _Data
|
|
{
|
|
CoglContext *ctx;
|
|
CoglFramebuffer *fb;
|
|
CoglPrimitive *triangle;
|
|
CoglPipeline *pipeline;
|
|
|
|
unsigned int redraw_idle;
|
|
CoglBool is_dirty;
|
|
CoglBool draw_ready;
|
|
} Data;
|
|
|
|
static gboolean
|
|
paint_cb (void *user_data)
|
|
{
|
|
Data *data = user_data;
|
|
|
|
data->redraw_idle = 0;
|
|
data->is_dirty = FALSE;
|
|
data->draw_ready = FALSE;
|
|
|
|
cogl_framebuffer_clear4f (data->fb, COGL_BUFFER_BIT_COLOR, 0, 0, 0, 1);
|
|
cogl_primitive_draw (data->triangle,
|
|
data->fb,
|
|
data->pipeline);
|
|
cogl_onscreen_swap_buffers (COGL_ONSCREEN (data->fb));
|
|
|
|
return G_SOURCE_REMOVE;
|
|
}
|
|
|
|
static void
|
|
maybe_redraw (Data *data)
|
|
{
|
|
if (data->is_dirty && data->draw_ready && data->redraw_idle == 0) {
|
|
/* We'll draw on idle instead of drawing immediately so that
|
|
* if Cogl reports multiple dirty rectangles we won't
|
|
* redundantly draw multiple frames */
|
|
data->redraw_idle = g_idle_add (paint_cb, data);
|
|
}
|
|
}
|
|
|
|
static void
|
|
frame_event_cb (CoglOnscreen *onscreen,
|
|
CoglFrameEvent event,
|
|
CoglFrameInfo *info,
|
|
void *user_data)
|
|
{
|
|
Data *data = user_data;
|
|
|
|
if (event == COGL_FRAME_EVENT_SYNC) {
|
|
data->draw_ready = TRUE;
|
|
maybe_redraw (data);
|
|
}
|
|
}
|
|
|
|
static void
|
|
dirty_cb (CoglOnscreen *onscreen,
|
|
const CoglOnscreenDirtyInfo *info,
|
|
void *user_data)
|
|
{
|
|
Data *data = user_data;
|
|
|
|
data->is_dirty = TRUE;
|
|
maybe_redraw (data);
|
|
}
|
|
|
|
int
|
|
main (int argc, char **argv)
|
|
{
|
|
Data data;
|
|
CoglOnscreen *onscreen;
|
|
CoglError *error = NULL;
|
|
CoglVertexP2C4 triangle_vertices[] = {
|
|
{0, 0.7, 0xff, 0x00, 0x00, 0xff},
|
|
{-0.7, -0.7, 0x00, 0xff, 0x00, 0xff},
|
|
{0.7, -0.7, 0x00, 0x00, 0xff, 0xff}
|
|
};
|
|
GSource *cogl_source;
|
|
GMainLoop *loop;
|
|
|
|
data.redraw_idle = 0;
|
|
data.is_dirty = FALSE;
|
|
data.draw_ready = TRUE;
|
|
|
|
data.ctx = cogl_context_new (NULL, &error);
|
|
if (!data.ctx) {
|
|
fprintf (stderr, "Failed to create context: %s\n", error->message);
|
|
return 1;
|
|
}
|
|
|
|
onscreen = cogl_onscreen_new (data.ctx, 640, 480);
|
|
cogl_onscreen_show (onscreen);
|
|
data.fb = COGL_FRAMEBUFFER (onscreen);
|
|
|
|
cogl_onscreen_set_resizable (onscreen, TRUE);
|
|
|
|
data.triangle = cogl_primitive_new_p2c4 (data.ctx,
|
|
COGL_VERTICES_MODE_TRIANGLES,
|
|
3, triangle_vertices);
|
|
data.pipeline = cogl_pipeline_new (data.ctx);
|
|
|
|
cogl_source = cogl_glib_source_new (data.ctx, G_PRIORITY_DEFAULT);
|
|
|
|
g_source_attach (cogl_source, NULL);
|
|
|
|
cogl_onscreen_add_frame_callback (COGL_ONSCREEN (data.fb),
|
|
frame_event_cb,
|
|
&data,
|
|
NULL); /* destroy notify */
|
|
cogl_onscreen_add_dirty_callback (COGL_ONSCREEN (data.fb),
|
|
dirty_cb,
|
|
&data,
|
|
NULL); /* destroy notify */
|
|
|
|
loop = g_main_loop_new (NULL, TRUE);
|
|
g_main_loop_run (loop);
|
|
|
|
return 0;
|
|
}
|