isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Remove unused CoglPipelineEvalFlags

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3437>
This commit is contained in:
Bilal Elmoussaoui 2023-12-02 11:23:06 +01:00 committed by Marge Bot
parent 893e6e49b1
commit 5d9e9707dd
9 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl/cogl/cogl-journal.c
View File

@ -446,8 +446,7 @@ compare_entry_pipelines (CoglJournalEntry *entry0, CoglJournalEntry *entry1)
entry1->pipeline, entry1->pipeline,
(COGL_PIPELINE_STATE_ALL & (COGL_PIPELINE_STATE_ALL &
~COGL_PIPELINE_STATE_COLOR), ~COGL_PIPELINE_STATE_COLOR),
COGL_PIPELINE_LAYER_STATE_ALL, COGL_PIPELINE_LAYER_STATE_ALL))
0))
return TRUE; return TRUE;
else else
return FALSE; return FALSE;
@ -1883,8 +1882,7 @@ _cogl_journal_try_read_pixel (CoglJournal *journal,
if (!_cogl_pipeline_equal (ctx->opaque_color_pipeline, entry->pipeline, if (!_cogl_pipeline_equal (ctx->opaque_color_pipeline, entry->pipeline,
(COGL_PIPELINE_STATE_ALL & (COGL_PIPELINE_STATE_ALL &
~COGL_PIPELINE_STATE_COLOR), ~COGL_PIPELINE_STATE_COLOR),
COGL_PIPELINE_LAYER_STATE_ALL, COGL_PIPELINE_LAYER_STATE_ALL))
0))
return FALSE; return FALSE;

6
cogl/cogl/cogl-pipeline-hash-table.c
View File

@ -88,8 +88,7 @@ entry_equal (const void *a,
return _cogl_pipeline_equal (entry_a->parent.pipeline, return _cogl_pipeline_equal (entry_a->parent.pipeline,
entry_b->parent.pipeline, entry_b->parent.pipeline,
hash->main_state, hash->main_state,
hash->layer_state, hash->layer_state);
0);
} }
void void
@ -185,8 +184,7 @@ _cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash,
dummy_entry.hash = hash; dummy_entry.hash = hash;
dummy_entry.hash_value = _cogl_pipeline_hash (key_pipeline, dummy_entry.hash_value = _cogl_pipeline_hash (key_pipeline,
hash->main_state, hash->main_state,
hash->layer_state, hash->layer_state);
0);
entry = g_hash_table_lookup (hash->table, &dummy_entry); entry = g_hash_table_lookup (hash->table, &dummy_entry);
if (entry) if (entry)

3
cogl/cogl/cogl-pipeline-layer-private.h
View File

@ -296,8 +296,7 @@ _cogl_pipeline_layer_resolve_authorities (CoglPipelineLayer *layer,
gboolean gboolean
_cogl_pipeline_layer_equal (CoglPipelineLayer *layer0, _cogl_pipeline_layer_equal (CoglPipelineLayer *layer0,
CoglPipelineLayer *layer1, CoglPipelineLayer *layer1,
unsigned long differences_mask, unsigned long differences_mask);
CoglPipelineEvalFlags flags);
CoglPipelineLayer * CoglPipelineLayer *
_cogl_pipeline_layer_pre_change_notify (CoglPipeline *required_owner, _cogl_pipeline_layer_pre_change_notify (CoglPipeline *required_owner,

3
cogl/cogl/cogl-pipeline-layer-state-private.h
View File

@ -43,8 +43,7 @@ _cogl_pipeline_set_layer_unit (CoglPipeline *required_owner,
gboolean gboolean
_cogl_pipeline_layer_texture_data_equal (CoglPipelineLayer *authority0, _cogl_pipeline_layer_texture_data_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1, CoglPipelineLayer *authority1);
CoglPipelineEvalFlags flags);
gboolean gboolean
_cogl_pipeline_layer_combine_state_equal (CoglPipelineLayer *authority0, _cogl_pipeline_layer_combine_state_equal (CoglPipelineLayer *authority0,

3
cogl/cogl/cogl-pipeline-layer-state.c
View File

@ -691,8 +691,7 @@ cogl_pipeline_add_layer_snippet (CoglPipeline *pipeline,
gboolean gboolean
_cogl_pipeline_layer_texture_data_equal (CoglPipelineLayer *authority0, _cogl_pipeline_layer_texture_data_equal (CoglPipelineLayer *authority0,
CoglPipelineLayer *authority1, CoglPipelineLayer *authority1)
CoglPipelineEvalFlags flags)
{ {
if (authority0->texture == NULL) if (authority0->texture == NULL)
{ {

6
cogl/cogl/cogl-pipeline-layer.c
View File

@ -636,8 +636,7 @@ _cogl_pipeline_layer_resolve_authorities (CoglPipelineLayer *layer,
gboolean gboolean
_cogl_pipeline_layer_equal (CoglPipelineLayer *layer0, _cogl_pipeline_layer_equal (CoglPipelineLayer *layer0,
CoglPipelineLayer *layer1, CoglPipelineLayer *layer1,
unsigned long differences_mask, unsigned long differences_mask)
CoglPipelineEvalFlags flags)
{ {
unsigned long layers_difference; unsigned long layers_difference;
CoglPipelineLayer *authorities0[COGL_PIPELINE_LAYER_STATE_SPARSE_COUNT]; CoglPipelineLayer *authorities0[COGL_PIPELINE_LAYER_STATE_SPARSE_COUNT];
@ -664,8 +663,7 @@ _cogl_pipeline_layer_equal (CoglPipelineLayer *layer0,
CoglPipelineLayerStateIndex state_index = CoglPipelineLayerStateIndex state_index =
COGL_PIPELINE_LAYER_STATE_TEXTURE_DATA_INDEX; COGL_PIPELINE_LAYER_STATE_TEXTURE_DATA_INDEX;
if (!_cogl_pipeline_layer_texture_data_equal (authorities0[state_index], if (!_cogl_pipeline_layer_texture_data_equal (authorities0[state_index],
authorities1[state_index], authorities1[state_index]))
flags))
return FALSE; return FALSE;
} }

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

@ -228,7 +228,6 @@ typedef struct
typedef struct _CoglPipelineHashState typedef struct _CoglPipelineHashState
{ {
unsigned long layer_differences; unsigned long layer_differences;
CoglPipelineEvalFlags flags;
unsigned int hash; unsigned int hash;
} CoglPipelineHashState; } CoglPipelineHashState;
@ -700,14 +699,12 @@ gboolean
_cogl_pipeline_equal (CoglPipeline *pipeline0, _cogl_pipeline_equal (CoglPipeline *pipeline0,
CoglPipeline *pipeline1, CoglPipeline *pipeline1,
unsigned int differences, unsigned int differences,
unsigned long layer_differences, unsigned long layer_differences);
CoglPipelineEvalFlags flags);
unsigned int unsigned int
_cogl_pipeline_hash (CoglPipeline *pipeline, _cogl_pipeline_hash (CoglPipeline *pipeline,
unsigned int differences, unsigned int differences,
unsigned long layer_differences, unsigned long layer_differences);
CoglPipelineEvalFlags flags);
/* Makes a copy of the given pipeline that is a child of the root /* Makes a copy of the given pipeline that is a child of the root
* pipeline rather than a child of the source pipeline. That way the * pipeline rather than a child of the source pipeline. That way the

16
cogl/cogl/cogl-pipeline.c
View File

@ -1846,8 +1846,7 @@ _cogl_pipeline_apply_overrides (CoglPipeline *pipeline,
static gboolean static gboolean
_cogl_pipeline_layers_equal (CoglPipeline *authority0, _cogl_pipeline_layers_equal (CoglPipeline *authority0,
CoglPipeline *authority1, CoglPipeline *authority1,
unsigned long differences, unsigned long differences)
CoglPipelineEvalFlags flags)
{ {
int i; int i;
@ -1861,8 +1860,7 @@ _cogl_pipeline_layers_equal (CoglPipeline *authority0,
{ {
if (!_cogl_pipeline_layer_equal (authority0->layers_cache[i], if (!_cogl_pipeline_layer_equal (authority0->layers_cache[i],
authority1->layers_cache[i], authority1->layers_cache[i],
differences, differences))
flags))
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -2008,8 +2006,7 @@ gboolean
_cogl_pipeline_equal (CoglPipeline *pipeline0, _cogl_pipeline_equal (CoglPipeline *pipeline0,
CoglPipeline *pipeline1, CoglPipeline *pipeline1,
unsigned int differences, unsigned int differences,
unsigned long layer_differences, unsigned long layer_differences)
CoglPipelineEvalFlags flags)
{ {
unsigned long pipelines_difference; unsigned long pipelines_difference;
CoglPipeline *authorities0[COGL_PIPELINE_STATE_SPARSE_COUNT]; CoglPipeline *authorities0[COGL_PIPELINE_STATE_SPARSE_COUNT];
@ -2140,8 +2137,7 @@ _cogl_pipeline_equal (CoglPipeline *pipeline0,
{ {
if (!_cogl_pipeline_layers_equal (authorities0[bit], if (!_cogl_pipeline_layers_equal (authorities0[bit],
authorities1[bit], authorities1[bit],
layer_differences, layer_differences))
flags))
goto done; goto done;
break; break;
} }
@ -2492,8 +2488,7 @@ _cogl_pipeline_init_state_hash_functions (void)
unsigned int unsigned int
_cogl_pipeline_hash (CoglPipeline *pipeline, _cogl_pipeline_hash (CoglPipeline *pipeline,
unsigned int differences, unsigned int differences,
unsigned long layer_differences, unsigned long layer_differences)
CoglPipelineEvalFlags flags)
{ {
CoglPipeline *authorities[COGL_PIPELINE_STATE_SPARSE_COUNT]; CoglPipeline *authorities[COGL_PIPELINE_STATE_SPARSE_COUNT];
unsigned int mask; unsigned int mask;
@ -2503,7 +2498,6 @@ _cogl_pipeline_hash (CoglPipeline *pipeline,
state.hash = 0; state.hash = 0;
state.layer_differences = layer_differences; state.layer_differences = layer_differences;
state.flags = flags;
_cogl_pipeline_update_real_blend_enable (pipeline, FALSE); _cogl_pipeline_update_real_blend_enable (pipeline, FALSE);

8
cogl/cogl/cogl-private.h
View File

@ -72,14 +72,6 @@ typedef enum
COGL_N_PRIVATE_FEATURES COGL_N_PRIVATE_FEATURES
} CoglPrivateFeature; } CoglPrivateFeature;
/* Sometimes when evaluating pipelines, either during comparisons or
* if calculating a hash value we need to tweak the evaluation
* semantics */
typedef enum _CoglPipelineEvalFlags
{
COGL_PIPELINE_EVAL_FLAG_NONE = 0
} CoglPipelineEvalFlags;
void void
_cogl_transform_point (const graphene_matrix_t *matrix_mv, _cogl_transform_point (const graphene_matrix_t *matrix_mv,
const graphene_matrix_t *matrix_p, const graphene_matrix_t *matrix_p,