Skip to content

Commit 668ae8c

Browse files
committed
Fix NEON smoothscale initial check
1 parent 80774a5 commit 668ae8c

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

src_c/transform.c

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,45 +1229,43 @@ smoothscale_init(struct _module_state *st)
12291229
st->filter_shrink_Y = filter_shrink_Y_SSE2;
12301230
st->filter_expand_X = filter_expand_X_SSE2;
12311231
st->filter_expand_Y = filter_expand_Y_SSE2;
1232+
return;
12321233
}
1233-
else if (SDL_HasNEON()) {
1234+
if (SDL_HasNEON()) {
12341235
st->filter_type = "NEON";
12351236
st->filter_shrink_X = filter_shrink_X_SSE2;
12361237
st->filter_shrink_Y = filter_shrink_Y_SSE2;
12371238
st->filter_expand_X = filter_expand_X_SSE2;
12381239
st->filter_expand_Y = filter_expand_Y_SSE2;
1240+
return;
12391241
}
12401242
#endif /* PG_ENABLE_SSE_NEON */
12411243
#endif /* !__EMSCRIPTEN__ */
12421244
#ifdef SCALE_MMX_SUPPORT
1243-
else if (SDL_HasSSE()) {
1245+
if (SDL_HasSSE()) {
12441246
st->filter_type = "SSE";
12451247
st->filter_shrink_X = filter_shrink_X_SSE;
12461248
st->filter_shrink_Y = filter_shrink_Y_SSE;
12471249
st->filter_expand_X = filter_expand_X_SSE;
12481250
st->filter_expand_Y = filter_expand_Y_SSE;
1251+
return;
12491252
}
1250-
else if (SDL_HasMMX()) {
1253+
if (SDL_HasMMX()) {
12511254
st->filter_type = "MMX";
12521255
st->filter_shrink_X = filter_shrink_X_MMX;
12531256
st->filter_shrink_Y = filter_shrink_Y_MMX;
12541257
st->filter_expand_X = filter_expand_X_MMX;
12551258
st->filter_expand_Y = filter_expand_Y_MMX;
1259+
return;
12561260
}
1257-
else {
1258-
st->filter_type = "GENERIC";
1259-
st->filter_shrink_X = filter_shrink_X_ONLYC;
1260-
st->filter_shrink_Y = filter_shrink_Y_ONLYC;
1261-
st->filter_expand_X = filter_expand_X_ONLYC;
1262-
st->filter_expand_Y = filter_expand_Y_ONLYC;
1263-
}
1264-
#else /* ~SCALE_MMX_SUPPORT */
1261+
#endif /* ~SCALE_MMX_SUPPORT */
1262+
1263+
/* If no accelerated options were selected, falls through to generic */
12651264
st->filter_type = "GENERIC";
12661265
st->filter_shrink_X = filter_shrink_X_ONLYC;
12671266
st->filter_shrink_Y = filter_shrink_Y_ONLYC;
12681267
st->filter_expand_X = filter_expand_X_ONLYC;
12691268
st->filter_expand_Y = filter_expand_Y_ONLYC;
1270-
#endif /* ~SCALE_MMX_SUPPORT */
12711269
}
12721270

12731271
static void

0 commit comments

Comments
 (0)