From 1783ea5af124e62e04fea3177c4d8ddca6784c95 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 8 Mar 2019 14:51:01 -0500 Subject: [PATCH] cogl: Remove unused texture_type argument from cogl_pipeline_set_layer_null_texture https://gitlab.gnome.org/GNOME/mutter/merge_requests/546 --- clutter/clutter/clutter-blur-effect.c | 4 +--- clutter/clutter/clutter-brightness-contrast-effect.c | 4 +--- clutter/clutter/clutter-colorize-effect.c | 4 +--- clutter/clutter/clutter-desaturate-effect.c | 4 +--- clutter/clutter/clutter-paint-nodes.c | 3 +-- clutter/clutter/deprecated/clutter-texture.c | 4 +--- cogl/cogl/cogl-pipeline-layer-state.c | 3 +-- cogl/cogl/cogl-pipeline-layer-state.h | 8 ++------ src/compositor/cogl-utils.c | 4 +--- 9 files changed, 10 insertions(+), 28 deletions(-) diff --git a/clutter/clutter/clutter-blur-effect.c b/clutter/clutter/clutter-blur-effect.c index 564f796b3..9a8cabbea 100644 --- a/clutter/clutter/clutter-blur-effect.c +++ b/clutter/clutter/clutter-blur-effect.c @@ -249,9 +249,7 @@ clutter_blur_effect_init (ClutterBlurEffect *self) cogl_pipeline_add_layer_snippet (klass->base_pipeline, 0, snippet); cogl_object_unref (snippet); - cogl_pipeline_set_layer_null_texture (klass->base_pipeline, - 0, /* layer number */ - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0); } self->pipeline = cogl_pipeline_copy (klass->base_pipeline); diff --git a/clutter/clutter/clutter-brightness-contrast-effect.c b/clutter/clutter/clutter-brightness-contrast-effect.c index 741a818fc..9bb3d9760 100644 --- a/clutter/clutter/clutter-brightness-contrast-effect.c +++ b/clutter/clutter/clutter-brightness-contrast-effect.c @@ -438,9 +438,7 @@ clutter_brightness_contrast_effect_init (ClutterBrightnessContrastEffect *self) cogl_pipeline_add_snippet (klass->base_pipeline, snippet); cogl_object_unref (snippet); - cogl_pipeline_set_layer_null_texture (klass->base_pipeline, - 0, /* layer number */ - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0); } self->pipeline = cogl_pipeline_copy (klass->base_pipeline); diff --git a/clutter/clutter/clutter-colorize-effect.c b/clutter/clutter/clutter-colorize-effect.c index 1662f7d28..73bd31949 100644 --- a/clutter/clutter/clutter-colorize-effect.c +++ b/clutter/clutter/clutter-colorize-effect.c @@ -293,9 +293,7 @@ clutter_colorize_effect_init (ClutterColorizeEffect *self) cogl_pipeline_add_snippet (klass->base_pipeline, snippet); cogl_object_unref (snippet); - cogl_pipeline_set_layer_null_texture (klass->base_pipeline, - 0, /* layer number */ - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0); } self->pipeline = cogl_pipeline_copy (klass->base_pipeline); diff --git a/clutter/clutter/clutter-desaturate-effect.c b/clutter/clutter/clutter-desaturate-effect.c index 061358a5f..bc691d5d0 100644 --- a/clutter/clutter/clutter-desaturate-effect.c +++ b/clutter/clutter/clutter-desaturate-effect.c @@ -297,9 +297,7 @@ clutter_desaturate_effect_init (ClutterDesaturateEffect *self) cogl_pipeline_add_snippet (klass->base_pipeline, snippet); cogl_object_unref (snippet); - cogl_pipeline_set_layer_null_texture (klass->base_pipeline, - 0, /* layer number */ - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (klass->base_pipeline, 0); } self->pipeline = cogl_pipeline_copy (klass->base_pipeline); diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c index d5efd5864..41c34393c 100644 --- a/clutter/clutter/clutter-paint-nodes.c +++ b/clutter/clutter/clutter-paint-nodes.c @@ -75,8 +75,7 @@ _clutter_paint_node_init_types (void) cogl_pipeline_set_color (default_color_pipeline, &cogl_color); default_texture_pipeline = cogl_pipeline_new (ctx); - cogl_pipeline_set_layer_null_texture (default_texture_pipeline, 0, - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (default_texture_pipeline, 0); cogl_pipeline_set_color (default_texture_pipeline, &cogl_color); cogl_pipeline_set_layer_wrap_mode (default_texture_pipeline, 0, COGL_PIPELINE_WRAP_MODE_AUTOMATIC); diff --git a/clutter/clutter/deprecated/clutter-texture.c b/clutter/clutter/deprecated/clutter-texture.c index bea239f45..7eae4ee46 100644 --- a/clutter/clutter/deprecated/clutter-texture.c +++ b/clutter/clutter/deprecated/clutter-texture.c @@ -1277,9 +1277,7 @@ clutter_texture_init (ClutterTexture *self) texture_template_pipeline = cogl_pipeline_new (ctx); pipeline = COGL_PIPELINE (texture_template_pipeline); - cogl_pipeline_set_layer_null_texture (pipeline, - 0, /* layer_index */ - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (pipeline, 0); } g_assert (texture_template_pipeline != NULL); diff --git a/cogl/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c index f3ce3767c..d53619c0b 100644 --- a/cogl/cogl/cogl-pipeline-layer-state.c +++ b/cogl/cogl/cogl-pipeline-layer-state.c @@ -225,8 +225,7 @@ cogl_pipeline_set_layer_texture (CoglPipeline *pipeline, void cogl_pipeline_set_layer_null_texture (CoglPipeline *pipeline, - int layer_index, - CoglTextureType texture_type) + int layer_index) { _cogl_pipeline_set_layer_texture_data (pipeline, layer_index, NULL); } diff --git a/cogl/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h index a60a3ad27..7be55bf11 100644 --- a/cogl/cogl/cogl-pipeline-layer-state.h +++ b/cogl/cogl/cogl-pipeline-layer-state.h @@ -162,10 +162,7 @@ cogl_pipeline_set_layer_texture (CoglPipeline *pipeline, * @texture_type: The type of the default texture to use * * Sets the texture for this layer to be the default texture for the - * given type. This is equivalent to calling - * cogl_pipeline_set_layer_texture() with %NULL for the texture - * argument except that you can also specify the type of default - * texture to use. The default texture is a 1x1 pixel white texture. + * given type. The default texture is a 1x1 pixel white texture. * * This function is mostly useful if you want to create a base * pipeline that you want to create multiple copies from using @@ -178,8 +175,7 @@ cogl_pipeline_set_layer_texture (CoglPipeline *pipeline, */ void cogl_pipeline_set_layer_null_texture (CoglPipeline *pipeline, - int layer_index, - CoglTextureType texture_type); + int layer_index); /** * cogl_pipeline_get_layer_texture: diff --git a/src/compositor/cogl-utils.c b/src/compositor/cogl-utils.c index 1d47d8895..fe92818bf 100644 --- a/src/compositor/cogl-utils.c +++ b/src/compositor/cogl-utils.c @@ -54,9 +54,7 @@ meta_create_texture_pipeline (CoglTexture *src_texture) clutter_backend_get_cogl_context (clutter_get_default_backend ()); texture_pipeline_template = cogl_pipeline_new (ctx); - cogl_pipeline_set_layer_null_texture (texture_pipeline_template, - 0, /* layer */ - COGL_TEXTURE_TYPE_2D); + cogl_pipeline_set_layer_null_texture (texture_pipeline_template, 0); } pipeline = cogl_pipeline_copy (texture_pipeline_template);