mirror of
https://github.com/edu4rdshl/gnome-shell.git
synced 2026-07-17 23:24:51 +00:00
Adapt to required CoglContext params
They used to retrieve it from a global variable which we are trying to remove upstream
This commit is contained in:
parent
99a36210b6
commit
78e223ace0
1 changed files with 6 additions and 4 deletions
|
|
@ -908,10 +908,11 @@ global_stage_before_paint (gpointer data)
|
|||
}
|
||||
|
||||
static gboolean
|
||||
load_gl_symbol (const char *name,
|
||||
load_gl_symbol (CoglContext *ctx,
|
||||
const char *name,
|
||||
void **func)
|
||||
{
|
||||
*func = cogl_get_proc_address (name);
|
||||
*func = cogl_get_proc_address (ctx, name);
|
||||
if (!*func)
|
||||
{
|
||||
g_warning ("failed to resolve required GL symbol \"%s\"\n", name);
|
||||
|
|
@ -928,6 +929,7 @@ global_stage_after_paint (ClutterStage *stage,
|
|||
{
|
||||
/* At this point, we've finished all layout and painting, but haven't
|
||||
* actually flushed or swapped */
|
||||
CoglContext *cogl_context = GNOME_SHELL_PLUGIN (global->plugin)->cogl_context;
|
||||
|
||||
if (global->frame_timestamps && global->frame_finish_timestamp)
|
||||
{
|
||||
|
|
@ -946,9 +948,9 @@ global_stage_after_paint (ClutterStage *stage,
|
|||
static void (*finish) (void);
|
||||
|
||||
if (!finish)
|
||||
load_gl_symbol ("glFinish", (void **)&finish);
|
||||
load_gl_symbol (cogl_context, "glFinish", (void **)&finish);
|
||||
|
||||
cogl_flush ();
|
||||
cogl_flush (cogl_context);
|
||||
finish ();
|
||||
|
||||
shell_perf_log_event (shell_perf_log_get_default (),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue