Skip to content

Commit 5f8edd4

Browse files
committed
glamor: fix parameter indentions on asprintf() calls
Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
1 parent 226211f commit 5f8edd4

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

glamor/glamor_gradient.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
339339
(stops_count > 0));
340340

341341
if (asprintf(&gradient_fs,
342-
gradient_radial_fs_template,
343-
PIXMAN_REPEAT_NONE, PIXMAN_REPEAT_NORMAL,
344-
PIXMAN_REPEAT_REFLECT,
345-
fs_getcolor_source) == -1)
342+
gradient_radial_fs_template,
343+
PIXMAN_REPEAT_NONE, PIXMAN_REPEAT_NORMAL,
344+
PIXMAN_REPEAT_REFLECT,
345+
fs_getcolor_source) == -1)
346346
return FALSE;
347347

348348
fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);
@@ -527,9 +527,9 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
527527
_glamor_create_getcolor_fs_source(screen, stops_count, stops_count > 0);
528528

529529
if (asprintf(&gradient_fs,
530-
gradient_fs_template,
531-
PIXMAN_REPEAT_NORMAL, PIXMAN_REPEAT_REFLECT,
532-
fs_getcolor_source) == -1)
530+
gradient_fs_template,
531+
PIXMAN_REPEAT_NORMAL, PIXMAN_REPEAT_REFLECT,
532+
fs_getcolor_source) == -1)
533533
return FALSE;
534534

535535
fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);

glamor/glamor_render.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,12 @@ glamor_create_composite_fs(glamor_screen_private *glamor_priv, struct shader_key
336336
}
337337

338338
if (asprintf(&source,
339-
"%s"
340-
GLAMOR_DEFAULT_PRECISION
341-
"%s%s%s%s%s%s%s%s", header, GLAMOR_COMPAT_DEFINES_FS,
342-
repeat_define, relocate_texture,
343-
enable_rel_sampler ? rel_sampler : stub_rel_sampler,
344-
source_fetch, mask_fetch, dest_swizzle, in) == -1)
339+
"%s"
340+
GLAMOR_DEFAULT_PRECISION
341+
"%s%s%s%s%s%s%s%s", header, GLAMOR_COMPAT_DEFINES_FS,
342+
repeat_define, relocate_texture,
343+
enable_rel_sampler ? rel_sampler : stub_rel_sampler,
344+
source_fetch, mask_fetch, dest_swizzle, in) == -1)
345345
FatalError("Memory allocation on asprintf() failed\n");
346346

347347
prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, source);
@@ -387,11 +387,11 @@ glamor_create_composite_vs(glamor_screen_private* priv, struct shader_key *key)
387387
version = version_gles3;
388388

389389
if (asprintf(&source,
390-
"%s"
391-
GLAMOR_DEFAULT_PRECISION
392-
"%s%s%s%s%s",
393-
version, defines, main_opening, source_coords_setup,
394-
mask_coords_setup, main_closing) == -1)
390+
"%s"
391+
GLAMOR_DEFAULT_PRECISION
392+
"%s%s%s%s%s",
393+
version, defines, main_opening, source_coords_setup,
394+
mask_coords_setup, main_closing) == -1)
395395
FatalError("malloc on asprintf() failed\n");
396396

397397
prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, source);

0 commit comments

Comments
 (0)