mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
glamor: fix parameter indentions on asprintf() calls
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
226211f7a7
commit
5f8edd4560
@@ -339,10 +339,10 @@ _glamor_create_radial_gradient_program(ScreenPtr screen, int stops_count,
|
|||||||
(stops_count > 0));
|
(stops_count > 0));
|
||||||
|
|
||||||
if (asprintf(&gradient_fs,
|
if (asprintf(&gradient_fs,
|
||||||
gradient_radial_fs_template,
|
gradient_radial_fs_template,
|
||||||
PIXMAN_REPEAT_NONE, PIXMAN_REPEAT_NORMAL,
|
PIXMAN_REPEAT_NONE, PIXMAN_REPEAT_NORMAL,
|
||||||
PIXMAN_REPEAT_REFLECT,
|
PIXMAN_REPEAT_REFLECT,
|
||||||
fs_getcolor_source) == -1)
|
fs_getcolor_source) == -1)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);
|
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,
|
|||||||
_glamor_create_getcolor_fs_source(screen, stops_count, stops_count > 0);
|
_glamor_create_getcolor_fs_source(screen, stops_count, stops_count > 0);
|
||||||
|
|
||||||
if (asprintf(&gradient_fs,
|
if (asprintf(&gradient_fs,
|
||||||
gradient_fs_template,
|
gradient_fs_template,
|
||||||
PIXMAN_REPEAT_NORMAL, PIXMAN_REPEAT_REFLECT,
|
PIXMAN_REPEAT_NORMAL, PIXMAN_REPEAT_REFLECT,
|
||||||
fs_getcolor_source) == -1)
|
fs_getcolor_source) == -1)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);
|
fs_prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, gradient_fs);
|
||||||
|
|||||||
@@ -336,12 +336,12 @@ glamor_create_composite_fs(glamor_screen_private *glamor_priv, struct shader_key
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (asprintf(&source,
|
if (asprintf(&source,
|
||||||
"%s"
|
"%s"
|
||||||
GLAMOR_DEFAULT_PRECISION
|
GLAMOR_DEFAULT_PRECISION
|
||||||
"%s%s%s%s%s%s%s%s", header, GLAMOR_COMPAT_DEFINES_FS,
|
"%s%s%s%s%s%s%s%s", header, GLAMOR_COMPAT_DEFINES_FS,
|
||||||
repeat_define, relocate_texture,
|
repeat_define, relocate_texture,
|
||||||
enable_rel_sampler ? rel_sampler : stub_rel_sampler,
|
enable_rel_sampler ? rel_sampler : stub_rel_sampler,
|
||||||
source_fetch, mask_fetch, dest_swizzle, in) == -1)
|
source_fetch, mask_fetch, dest_swizzle, in) == -1)
|
||||||
FatalError("Memory allocation on asprintf() failed\n");
|
FatalError("Memory allocation on asprintf() failed\n");
|
||||||
|
|
||||||
prog = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, source);
|
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)
|
|||||||
version = version_gles3;
|
version = version_gles3;
|
||||||
|
|
||||||
if (asprintf(&source,
|
if (asprintf(&source,
|
||||||
"%s"
|
"%s"
|
||||||
GLAMOR_DEFAULT_PRECISION
|
GLAMOR_DEFAULT_PRECISION
|
||||||
"%s%s%s%s%s",
|
"%s%s%s%s%s",
|
||||||
version, defines, main_opening, source_coords_setup,
|
version, defines, main_opening, source_coords_setup,
|
||||||
mask_coords_setup, main_closing) == -1)
|
mask_coords_setup, main_closing) == -1)
|
||||||
FatalError("malloc on asprintf() failed\n");
|
FatalError("malloc on asprintf() failed\n");
|
||||||
|
|
||||||
prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, source);
|
prog = glamor_compile_glsl_prog(GL_VERTEX_SHADER, source);
|
||||||
|
|||||||
Reference in New Issue
Block a user