brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl: Remove unused CoglPipelineFragend::passthrough

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/819
This commit is contained in:
Adam Jackson 2019-03-07 13:52:33 -05:00
parent f5050a4f80
commit e922c640ef
3 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/cogl/cogl-pipeline-private.h
View File

@ -429,7 +429,6 @@ typedef struct _CoglPipelineFragend
gboolean (*add_layer) (CoglPipeline *pipeline, gboolean (*add_layer) (CoglPipeline *pipeline,
CoglPipelineLayer *layer, CoglPipelineLayer *layer,
unsigned long layers_difference); unsigned long layers_difference);
gboolean (*passthrough) (CoglPipeline *pipeline);
gboolean (*end) (CoglPipeline *pipeline, gboolean (*end) (CoglPipeline *pipeline,
unsigned long pipelines_difference); unsigned long pipelines_difference);

1
cogl/cogl/driver/gl/cogl-pipeline-fragend-glsl.c
View File

@ -1119,7 +1119,6 @@ const CoglPipelineFragend _cogl_pipeline_glsl_fragend =
{ {
_cogl_pipeline_fragend_glsl_start, _cogl_pipeline_fragend_glsl_start,
_cogl_pipeline_fragend_glsl_add_layer, _cogl_pipeline_fragend_glsl_add_layer,
NULL, /* passthrough */
_cogl_pipeline_fragend_glsl_end, _cogl_pipeline_fragend_glsl_end,
_cogl_pipeline_fragend_glsl_pre_change_notify, _cogl_pipeline_fragend_glsl_pre_change_notify,
_cogl_pipeline_fragend_glsl_layer_pre_change_notify _cogl_pipeline_fragend_glsl_layer_pre_change_notify

7
cogl/cogl/driver/gl/cogl-pipeline-opengl.c
View File

@ -1173,13 +1173,6 @@ _cogl_pipeline_flush_gl_state (CoglContext *ctx,
if (G_UNLIKELY (state.error_adding_layer)) if (G_UNLIKELY (state.error_adding_layer))
continue; continue;
if (!state.added_layer)
{
if (fragend->passthrough &&
G_UNLIKELY (!fragend->passthrough (pipeline)))
continue;
}
if (G_UNLIKELY (!fragend->end (pipeline, pipelines_difference))) if (G_UNLIKELY (!fragend->end (pipeline, pipelines_difference)))
continue; continue;