This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch span-gl-clean
in repository efl.
View the commit online.
commit 6cf297f7ce894a550c766ae78eb668958cdeabca
Author: [email protected] <[email protected]>
AuthorDate: Mon Sep 14 09:13:17 2026 -0600
evas_ector_gl: give every for loop a { } body
The review pointed out that _alloc_row() in evas_ector_gl_grad_atlas.c
had a for loop whose body was a bare statement. That is hard to read and
not EFL practice: a loop body is always a block, even for one statement.
Brace all 19 such loops added by this branch:
- evas_ector_gl_grad_atlas.c: _find_identity(), _alloc_row(), the
pinned-row ageing loop and the LRU search;
- evas_ector_gl_span.c: span_collector_resize() and
span_collector_clear();
- evas_ector_gl_span_shader.c: the nested shader cleanup loops, the VAO
cleanup, the row copy and the vertex fill;
- gl_generic/evas_engine.c: both has_data loops;
- the unit tests in ector_test_grad_atlas.c, ector_test_span_collector.c
and evas_test_vg.c.
While there, the two one-line blocks inside those loops are split into
one statement per line, the comment in the ageing loop moves inside the
if block above the assignment it explains, and the vertex-fill call is
rewrapped to stay under 100 columns. The loops in SPAN_PAGE_FOREACH were
already braced and are unchanged.
Ignoring whitespace, the diff only adds braces and splits those two
blocks. The build is clean, and ector_suite and evas_suite pass.
Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
---
.../engines/gl_generic/evas_ector_gl_grad_atlas.c | 41 +++++++++++-------
.../evas/engines/gl_generic/evas_ector_gl_span.c | 8 +++-
.../engines/gl_generic/evas_ector_gl_span_shader.c | 49 ++++++++++++++--------
src/modules/evas/engines/gl_generic/evas_engine.c | 8 +++-
src/tests/ector/suite/ector_test_grad_atlas.c | 8 +++-
src/tests/ector/suite/ector_test_span_collector.c | 12 ++++--
src/tests/evas/evas_test_vg.c | 4 +-
7 files changed, 89 insertions(+), 41 deletions(-)
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_grad_atlas.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_grad_atlas.c
index bcd6644ead..710dcb0ad5 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_grad_atlas.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_grad_atlas.c
@@ -126,10 +126,12 @@ static int
_find_identity(Span_Grad_Atlas *a, void *grad_id, uint32_t version)
{
for (int i = 0; i < SPAN_GRAD_ATLAS_H; i++)
- if (a->rows[i].occupied &&
- (a->rows[i].grad_id == grad_id) &&
- (a->rows[i].version == version))
- return i;
+ {
+ if (a->rows[i].occupied &&
+ (a->rows[i].grad_id == grad_id) &&
+ (a->rows[i].version == version))
+ return i;
+ }
return -1;
}
@@ -167,7 +169,9 @@ static int
_alloc_row(Span_Grad_Atlas *a)
{
for (int i = 0; i < SPAN_GRAD_ATLAS_H; i++)
- if (!a->rows[i].occupied) return i;
+ {
+ if (!a->rows[i].occupied) return i;
+ }
int best = -1;
uint32_t best_age = 0;
@@ -188,19 +192,28 @@ _alloc_row(Span_Grad_Atlas *a)
{
a->flush_cb(a->flush_data);
for (int i = 0; i < SPAN_GRAD_ATLAS_H; i++)
- if (a->rows[i].last_used == a->current_frame)
- // current_frame is uint32_t; guard against underflow when this
- // branch is reached before the first frame_begin() (current_frame
- // == 0). Without the guard every row's age would wrap to
- // UINT32_MAX and never be beaten again, flattening the LRU for
- // the atlas's lifetime.
- a->rows[i].last_used = a->current_frame ? (a->current_frame - 1) : 0;
+ {
+ if (a->rows[i].last_used == a->current_frame)
+ {
+ // current_frame is uint32_t; guard against underflow when this
+ // branch is reached before the first frame_begin() (current_frame
+ // == 0). Without the guard every row's age would wrap to
+ // UINT32_MAX and never be beaten again, flattening the LRU for
+ // the atlas's lifetime.
+ a->rows[i].last_used = a->current_frame ? (a->current_frame - 1) : 0;
+ }
+ }
best = 0;
best_age = a->rows[0].last_used;
for (int i = 1; i < SPAN_GRAD_ATLAS_H; i++)
- if (a->rows[i].last_used < best_age)
- { best = i; best_age = a->rows[i].last_used; }
+ {
+ if (a->rows[i].last_used < best_age)
+ {
+ best = i;
+ best_age = a->rows[i].last_used;
+ }
+ }
return best;
}
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_span.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_span.c
index bf912b2b19..74a8759af2 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_span.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_span.c
@@ -150,7 +150,9 @@ span_collector_resize(Span_Collector *sc, int h)
{
int ti;
for (ti = 0; ti < sc->texture_count; ti++)
- sc->textures[ti].dirty = EINA_TRUE;
+ {
+ sc->textures[ti].dirty = EINA_TRUE;
+ }
}
// Common case: h fits within existing allocation - no realloc needed.
@@ -244,7 +246,9 @@ span_collector_clear(Span_Collector *sc)
// _collect_spans_solid memsets the full tail for rows it touches,
// so this 4-byte-stride write covers only the uncollected rows.
for (y = 0; y < sc->h; y++)
- tex->buffer[((size_t)y * sc->stride) + 1] = 0; // byte[1] = len = 0
+ {
+ tex->buffer[((size_t)y * sc->stride) + 1] = 0; // byte[1] = len = 0
+ }
tex->dirty = EINA_FALSE;
tex->rolling_hash = 2166136261u; // seed
diff --git a/src/modules/evas/engines/gl_generic/evas_ector_gl_span_shader.c b/src/modules/evas/engines/gl_generic/evas_ector_gl_span_shader.c
index e9f3a788f6..fa3a17d318 100644
--- a/src/modules/evas/engines/gl_generic/evas_ector_gl_span_shader.c
+++ b/src/modules/evas/engines/gl_generic/evas_ector_gl_span_shader.c
@@ -1235,17 +1235,21 @@ span_shader_shutdown(void)
_span_fs_highp = -1;
for (kind = 0; kind < 2; kind++)
- for (b = 0; b < (int)SPAN_BIND_COUNT; b++)
- for (mask = 0; mask < 2; mask++)
- {
- Span_Shader *ss = &_span_shaders[kind][b][mask];
- if (ss->program)
- {
- glDeleteProgram(ss->program);
- ss->program = 0;
- }
- ss->samplers_bound = EINA_FALSE;
- }
+ {
+ for (b = 0; b < (int)SPAN_BIND_COUNT; b++)
+ {
+ for (mask = 0; mask < 2; mask++)
+ {
+ Span_Shader *ss = &_span_shaders[kind][b][mask];
+ if (ss->program)
+ {
+ glDeleteProgram(ss->program);
+ ss->program = 0;
+ }
+ ss->samplers_bound = EINA_FALSE;
+ }
+ }
+ }
if (_white_mask_tex)
{
@@ -1257,7 +1261,13 @@ span_shader_shutdown(void)
{
int v;
for (v = 0; v < SPAN_VARIANT_COUNT; v++)
- if (_span_vao[v]) { _gl_del_vao(1, &_span_vao[v]); _span_vao[v] = 0; }
+ {
+ if (_span_vao[v])
+ {
+ _gl_del_vao(1, &_span_vao[v]);
+ _span_vao[v] = 0;
+ }
+ }
}
if (_span_vbo)
{
@@ -1544,9 +1554,11 @@ span_page_upload(void *gc_ptr, Span_Page *page,
}
for (y = 0; y < ent[j].rows; y++)
- memcpy(packed + ((size_t)(at + y) * row_bytes),
- tex->buffer + ((size_t)y * ent[j].stride),
- row_bytes);
+ {
+ memcpy(packed + ((size_t)(at + y) * row_bytes),
+ tex->buffer + ((size_t)y * ent[j].stride),
+ row_bytes);
+ }
at += ent[j].rows;
}
@@ -1797,8 +1809,11 @@ span_pass_draw(Evas_Engine_GL_Context *gc, Evas_GL_Image *target,
if (!buf) break;
for (k = run_start; k < end; k++)
- evas_gl_common_span_fill_vertices((char *)buf + (vsize * 6 * (size_t)(k - run_start)),
- variant, &quads[k], ndc + (k * 8));
+ {
+ evas_gl_common_span_fill_vertices((char *)buf +
+ (vsize * 6 * (size_t)(k - run_start)),
+ variant, &quads[k], ndc + (k * 8));
+ }
_span_draw_batch(gc, variant, buf, need, 6 * (end - run_start),
quads[run_start].fill.tex, quads[run_start].stroke.tex,
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c
index eb211d2b92..2a34762688 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -3227,9 +3227,13 @@ eng_ector_end(void *engine,
{
int has_data = 0;
for (ci = 0; !has_data && (ci < fill_count); ci++)
- has_data |= (((Span_Collector *)fill_arr[ci])->actual_max_spans > 0);
+ {
+ has_data |= (((Span_Collector *)fill_arr[ci])->actual_max_spans > 0);
+ }
for (ci = 0; !has_data && (ci < stroke_count); ci++)
- has_data |= (((Span_Collector *)stroke_arr[ci])->actual_max_spans > 0);
+ {
+ has_data |= (((Span_Collector *)stroke_arr[ci])->actual_max_spans > 0);
+ }
if (!has_data) goto span_done;
}
diff --git a/src/tests/ector/suite/ector_test_grad_atlas.c b/src/tests/ector/suite/ector_test_grad_atlas.c
index fc7cf10a2a..a32122918a 100644
--- a/src/tests/ector/suite/ector_test_grad_atlas.c
+++ b/src/tests/ector/suite/ector_test_grad_atlas.c
@@ -88,8 +88,12 @@ EFL_START_TEST(grad_atlas_distinct_ramps_get_distinct_rows)
}
// All 64 rows should be unique.
for (int i = 0; i < SPAN_GRAD_ATLAS_H; i++)
- for (int j = i + 1; j < SPAN_GRAD_ATLAS_H; j++)
- ck_assert_int_ne(rows[i], rows[j]);
+ {
+ for (int j = i + 1; j < SPAN_GRAD_ATLAS_H; j++)
+ {
+ ck_assert_int_ne(rows[i], rows[j]);
+ }
+ }
span_grad_atlas_free(a);
}
diff --git a/src/tests/ector/suite/ector_test_span_collector.c b/src/tests/ector/suite/ector_test_span_collector.c
index 1df326b834..8c6c4222b7 100644
--- a/src/tests/ector/suite/ector_test_span_collector.c
+++ b/src/tests/ector/suite/ector_test_span_collector.c
@@ -283,7 +283,9 @@ EFL_START_TEST(span_collector_solid_oob)
_collect_spans_solid(2, spans, &sd);
for (i = 0; i < 50; i++)
- ck_assert_int_eq(sc->textures[0].span_counts[i], 0);
+ {
+ ck_assert_int_eq(sc->textures[0].span_counts[i], 0);
+ }
span_collector_free(sc);
}
@@ -465,7 +467,9 @@ EFL_START_TEST(span_collector_overflow_split)
}
}
for (i = 0; i < 5; i++)
- ck_assert_int_eq(found[i], 1);
+ {
+ ck_assert_int_eq(found[i], 1);
+ }
span_collector_free(sc);
}
@@ -681,7 +685,9 @@ EFL_START_TEST(span_collector_solid_overflow_drop)
total = 0;
for (i = 0; i < sc->texture_count; i++)
- total += sc->textures[i].span_counts[3];
+ {
+ total += sc->textures[i].span_counts[3];
+ }
ck_assert_int_ge(total, 5);
span_collector_free(sc);
diff --git a/src/tests/evas/evas_test_vg.c b/src/tests/evas/evas_test_vg.c
index 6c043e915c..7d2961bfc5 100644
--- a/src/tests/evas/evas_test_vg.c
+++ b/src/tests/evas/evas_test_vg.c
@@ -94,7 +94,9 @@ _scene_sample(const char *engine, void (*build)(Evas *e),
// Several frames: the first one populates caches, and failures in the
// vector paths have tended to need a second pass to show up.
for (i = 0; i < frames; i++)
- ecore_evas_manual_render(ee);
+ {
+ ecore_evas_manual_render(ee);
+ }
// A snapshot reads back uniformly whether the engine renders to memory
// or to a window.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
