AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

snapshot: Move sanity checks to a better place

Browse Source 
Fixes cases where the sanity checks would reject valid code, like when
using GL shaders on a scaled transform.

Fixes #3819
This commit is contained in:
Benjamin Otte 2021-04-01 16:37:47 +02:00
parent 05e4cd1579
commit ef455f5c85
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtksnapshot.c
View File

@ -1413,7 +1413,8 @@ gtk_snapshot_append_node_internal (GtkSnapshot *snapshot,
} }
static GskRenderNode * static GskRenderNode *
gtk_snapshot_pop_internal (GtkSnapshot *snapshot) gtk_snapshot_pop_internal (GtkSnapshot *snapshot,
gboolean is_texture_pop)
{ {
GtkSnapshotState *state; GtkSnapshotState *state;
GskRenderNode *node; GskRenderNode *node;
@ -1437,6 +1438,17 @@ gtk_snapshot_pop_internal (GtkSnapshot *snapshot)
g_warning ("Too many gtk_snapshot_save() calls. %u saves remaining.", forgotten_restores); g_warning ("Too many gtk_snapshot_save() calls. %u saves remaining.", forgotten_restores);
} }
if (is_texture_pop && (state->collect_func != gtk_snapshot_collect_gl_shader_texture))
{
g_critical ("Unexpected call to gtk_snapshot_gl_shader_pop_texture().");
return NULL;
}
else if (!is_texture_pop && (state->collect_func == gtk_snapshot_collect_gl_shader_texture))
{
g_critical ("Expected a call to gtk_snapshot_gl_shader_pop_texture().");
return NULL;
}
return gtk_snapshot_pop_one (snapshot); return gtk_snapshot_pop_one (snapshot);
} }
@ -1460,7 +1472,7 @@ gtk_snapshot_push_collect (GtkSnapshot *snapshot)
GskRenderNode * GskRenderNode *
gtk_snapshot_pop_collect (GtkSnapshot *snapshot) gtk_snapshot_pop_collect (GtkSnapshot *snapshot)
{ {
GskRenderNode *result = gtk_snapshot_pop_internal (snapshot); GskRenderNode *result = gtk_snapshot_pop_internal (snapshot, FALSE);
return result; return result;
} }
@ -1483,7 +1495,7 @@ gtk_snapshot_to_node (GtkSnapshot *snapshot)
{ {
GskRenderNode *result; GskRenderNode *result;
result = gtk_snapshot_pop_internal (snapshot); result = gtk_snapshot_pop_internal (snapshot, FALSE);
/* We should have exactly our initial state */ /* We should have exactly our initial state */
if (!gtk_snapshot_states_is_empty (&snapshot->state_stack)) if (!gtk_snapshot_states_is_empty (&snapshot->state_stack))
@ -1551,13 +1563,9 @@ gtk_snapshot_to_paintable (GtkSnapshot *snapshot,
void void
gtk_snapshot_pop (GtkSnapshot *snapshot) gtk_snapshot_pop (GtkSnapshot *snapshot)
{ {
GtkSnapshotState *state = gtk_snapshot_get_current_state (snapshot);
GskRenderNode *node; GskRenderNode *node;
if (state->collect_func == gtk_snapshot_collect_gl_shader_texture) node = gtk_snapshot_pop_internal (snapshot, FALSE);
g_warning ("Not enough calls to gtk_snapshot_gl_shader_pop_texture().");
node = gtk_snapshot_pop_internal (snapshot);
if (node) if (node)
gtk_snapshot_append_node_internal (snapshot, node); gtk_snapshot_append_node_internal (snapshot, node);
@ -1577,18 +1585,9 @@ gtk_snapshot_pop (GtkSnapshot *snapshot)
void void
gtk_snapshot_gl_shader_pop_texture (GtkSnapshot *snapshot) gtk_snapshot_gl_shader_pop_texture (GtkSnapshot *snapshot)
{ {
GtkSnapshotState *state = gtk_snapshot_get_current_state (snapshot);
G_GNUC_UNUSED GskRenderNode *node; G_GNUC_UNUSED GskRenderNode *node;
if (state->collect_func != gtk_snapshot_collect_gl_shader_texture) node = gtk_snapshot_pop_internal (snapshot, TRUE);
{
g_warning ("Too many calls to gtk_snapshot_gl_shader_pop_texture().");
return;
}
g_assert (state->collect_func == gtk_snapshot_collect_gl_shader_texture);
node = gtk_snapshot_pop_internal (snapshot);
g_assert (node == NULL); g_assert (node == NULL);
} }