534e535a28
This removes cogl-queue.h and adds a copy of Wayland's embedded list implementation. The advantage of the Wayland model is that it is much simpler and so it is easier to follow. It also doesn't require defining a typedef for every list type. The downside is that there is only one list type which is a doubly-linked list where the head has a pointer to both the beginning and the end. The BSD implementation has many more combinations some of which we were taking advantage of to reduce the size of critical structs where we didn't need a pointer to the end of the list. The corresponding changes to uses of cogl-queue.h are: • COGL_STAILQ_* was used for onscreen the list of events and dirty notifications. This makes the size of the CoglContext grow by one pointer. • COGL_TAILQ_* was used for fences. • COGL_LIST_* for CoglClosures. In this case the list head now has an extra pointer which means CoglOnscreen will grow by the size of three pointers, but this doesn't seem like a particularly important struct to optimise for size anyway. • COGL_LIST_* was used for the list of foreign GLES2 offscreens. • COGL_TAILQ_* was used for the list of sub stacks in a CoglMemoryStack. • COGL_LIST_* was used to track the list of layers that haven't had code generated yet while generating a fragment shader for a pipeline. • COGL_LIST_* was used to track the pipeline hierarchy in CoglNode. The last part is a bit more controversial because it increases the size of CoglPipeline and CoglPipelineLayer by one pointer in order to have the redundant tail pointer for the list head. Normally we try to be very careful about the size of the CoglPipeline struct. Because CoglPipeline is slice-allocated, this effectively ends up adding two pointers to the size because GSlice rounds up to the size of two pointers. Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit 13abf613b15f571ba1fcf6d2eb831ffc6fa31324) Conflicts: cogl/cogl-context-private.h cogl/cogl-context.c cogl/driver/gl/cogl-pipeline-fragend-glsl.c doc/reference/cogl-2.0-experimental/Makefile.am
105 lines
2.7 KiB
C
105 lines
2.7 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2012, 2013 Intel Corporation.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "cogl-sdl.h"
|
|
#include "cogl-context-private.h"
|
|
#include "cogl-renderer-private.h"
|
|
|
|
void
|
|
cogl_sdl_renderer_set_event_type (CoglRenderer *renderer, int type)
|
|
{
|
|
renderer->sdl_event_type_set = TRUE;
|
|
renderer->sdl_event_type = type;
|
|
}
|
|
|
|
int
|
|
cogl_sdl_renderer_get_event_type (CoglRenderer *renderer)
|
|
{
|
|
_COGL_RETURN_VAL_IF_FAIL (renderer->sdl_event_type_set, SDL_USEREVENT);
|
|
|
|
return renderer->sdl_event_type;
|
|
}
|
|
|
|
CoglContext *
|
|
cogl_sdl_context_new (int type, CoglError **error)
|
|
{
|
|
CoglRenderer *renderer = cogl_renderer_new ();
|
|
CoglDisplay *display;
|
|
|
|
cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_SDL);
|
|
|
|
cogl_sdl_renderer_set_event_type (renderer, type);
|
|
|
|
if (!cogl_renderer_connect (renderer, error))
|
|
return NULL;
|
|
|
|
display = cogl_display_new (renderer, NULL);
|
|
if (!cogl_display_setup (display, error))
|
|
return NULL;
|
|
|
|
return cogl_context_new (display, error);
|
|
}
|
|
|
|
void
|
|
cogl_sdl_handle_event (CoglContext *context, SDL_Event *event)
|
|
{
|
|
CoglRenderer *renderer;
|
|
|
|
_COGL_RETURN_IF_FAIL (cogl_is_context (context));
|
|
|
|
renderer = context->display->renderer;
|
|
|
|
_cogl_renderer_handle_native_event (renderer, event);
|
|
}
|
|
|
|
static void
|
|
_cogl_sdl_push_wakeup_event (CoglContext *context)
|
|
{
|
|
SDL_Event wakeup_event;
|
|
|
|
wakeup_event.type = context->display->renderer->sdl_event_type;
|
|
|
|
SDL_PushEvent (&wakeup_event);
|
|
}
|
|
|
|
void
|
|
cogl_sdl_idle (CoglContext *context)
|
|
{
|
|
CoglRenderer *renderer = context->display->renderer;
|
|
|
|
cogl_poll_renderer_dispatch (renderer, NULL, 0);
|
|
|
|
/* It is expected that this will be called from the application
|
|
* immediately before blocking in SDL_WaitEvent. However,
|
|
* dispatching cause more work to be queued. If that happens we need
|
|
* to make sure the blocking returns immediately. We'll post our
|
|
* dummy event to make sure that happens
|
|
*/
|
|
if (!_cogl_list_empty (&renderer->idle_closures))
|
|
_cogl_sdl_push_wakeup_event (context);
|
|
}
|