Skip to content

cogl/shader: Don't keep the compilation pipeline alive #877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anthonytheinventor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cogl/shader: Don't keep the compilation pipeline alive #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cogl/cogl/deprecated/cogl-shader-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ struct _CoglShader
{
CoglHandleObject _parent;
GLuint gl_handle;
CoglPipeline *compilation_pipeline;
GArray *compiled_layers; /* layer indices, not the pipeline: it owns us */
CoglShaderType type;
char *source;
};
Expand Down
38 changes: 27 additions & 11 deletions cogl/cogl/deprecated/cogl-shader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ _cogl_shader_free (CoglShader *shader)
if (shader->gl_handle)
GE (ctx, glDeleteShader (shader->gl_handle));

g_clear_pointer (&shader->compiled_layers, g_array_unref);
g_free (shader->source);
g_slice_free (CoglShader, shader);
}

Expand All @@ -85,7 +87,8 @@ cogl_create_shader (CoglShaderType type)

shader = g_slice_new (CoglShader);
shader->gl_handle = 0;
shader->compilation_pipeline = NULL;
shader->compiled_layers = NULL;
shader->source = NULL;
shader->type = type;

return _cogl_shader_handle_new (shader);
Expand All @@ -101,11 +104,7 @@ delete_shader (CoglShader *shader)

shader->gl_handle = 0;

if (shader->compilation_pipeline)
{
cogl_object_unref (shader->compilation_pipeline);
shader->compilation_pipeline = NULL;
}
g_clear_pointer (&shader->compiled_layers, g_array_unref);
}

void
Expand All @@ -124,27 +123,44 @@ cogl_shader_source (CoglHandle handle,
shader->source = g_strdup (source);
}

static gboolean
append_layer_index_cb (CoglPipeline *pipeline,
int layer_index,
void *user_data)
{
g_array_append_val ((GArray *) user_data, layer_index);
return TRUE;
}

void
_cogl_shader_compile_real (CoglHandle handle,
CoglPipeline *pipeline)
{
CoglShader *shader = handle;
GLenum gl_type;
GLint status;
GArray *layers;

_COGL_GET_CONTEXT (ctx, NO_RETVAL);

layers = g_array_new (TRUE, FALSE, sizeof (int));
cogl_pipeline_foreach_layer (pipeline, append_layer_index_cb, layers);

if (shader->gl_handle)
{
CoglPipeline *prev = shader->compilation_pipeline;
GArray *prev = shader->compiled_layers;

/* XXX: currently the only things that will affect the
* boilerplate for user shaders, apart from driver features,
* are the pipeline layer-indices and texture-unit-indices
* (units follow layer order, so the indices cover both)
*/
if (pipeline == prev ||
_cogl_pipeline_layer_and_unit_numbers_equal (prev, pipeline))
return;
if (layers->len == prev->len &&
memcmp (layers->data, prev->data, layers->len * sizeof (int)) == 0)
{
g_array_unref (layers);
return;
}
}

if (shader->gl_handle)
Expand Down Expand Up @@ -176,7 +192,7 @@ _cogl_shader_compile_real (CoglHandle handle,

GE (ctx, glCompileShader (shader->gl_handle));

shader->compilation_pipeline = cogl_object_ref (pipeline);
shader->compiled_layers = layers;

GE (ctx, glGetShaderiv (shader->gl_handle, GL_COMPILE_STATUS, &status));
if (!status)
Expand Down