Module: Mesa Branch: main Commit: 255a4d55c6a6f56a02d24fb0c888bf0d0ea5b36b URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=255a4d55c6a6f56a02d24fb0c888bf0d0ea5b36b
Author: Dylan Baker <[email protected]> Date: Wed Mar 16 14:17:07 2022 -0700 llvmpipe: cleanup trailing whitespace Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15418> --- src/gallium/drivers/llvmpipe/lp_context.c | 12 ++++++------ src/gallium/drivers/llvmpipe/lp_scene.c | 2 +- src/gallium/drivers/llvmpipe/lp_state_fs.c | 14 +++++++------- src/gallium/drivers/llvmpipe/lp_state_setup.c | 16 ++++++++-------- src/gallium/drivers/llvmpipe/lp_state_setup.h | 2 +- src/gallium/drivers/llvmpipe/lp_texture.c | 12 ++++++------ 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c index 8038e219015..8f494e8332e 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.c +++ b/src/gallium/drivers/llvmpipe/lp_context.c @@ -1,9 +1,9 @@ /************************************************************************** - * + * * Copyright 2007 VMware, Inc. * All Rights Reserved. * Copyright 2008 VMware, Inc. All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -11,11 +11,11 @@ * distribute, sub license, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. @@ -23,7 +23,7 @@ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * + * **************************************************************************/ /* Author: @@ -288,7 +288,7 @@ llvmpipe_create_context(struct pipe_screen *screen, void *priv, draw_install_aapoint_stage(llvmpipe->draw, &llvmpipe->pipe); draw_install_pstipple_stage(llvmpipe->draw, &llvmpipe->pipe); - /* convert points and lines into triangles: + /* convert points and lines into triangles: * (otherwise, draw points and lines natively) */ draw_wide_point_sprites(llvmpipe->draw, FALSE); diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c index dbe0cc3873c..dd89b8546da 100644 --- a/src/gallium/drivers/llvmpipe/lp_scene.c +++ b/src/gallium/drivers/llvmpipe/lp_scene.c @@ -375,7 +375,7 @@ lp_scene_new_data_block( struct lp_scene *scene ) struct data_block *block = MALLOC_STRUCT(data_block); if (!block) return NULL; - + scene->scene_size += sizeof *block; block->used = 0; diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index 11aaf4a64eb..c7aa24bcdb6 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -1,9 +1,9 @@ /************************************************************************** - * + * * Copyright 2009 VMware, Inc. * Copyright 2007 VMware, Inc. * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -11,11 +11,11 @@ * distribute, sub license, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. @@ -23,7 +23,7 @@ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * + * **************************************************************************/ /** @@ -3067,7 +3067,7 @@ generate_fragment(struct llvmpipe_context *lp, blend_type.width = 8; /* 8-bit ubyte values */ blend_type.length = 16; /* 16 elements per vector */ - /* + /* * Generate the function prototype. Any change here must be reflected in * lp_jit.h's lp_jit_frag_func function pointer type, and vice-versa. */ @@ -3712,7 +3712,7 @@ generate_variant(struct llvmpipe_context *lp, llvmpipe_fs_variant_fastpath(variant); lp_jit_init_types(variant); - + if (variant->jit_function[RAST_EDGE_TEST] == NULL) generate_fragment(lp, shader, variant, RAST_EDGE_TEST); diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.c b/src/gallium/drivers/llvmpipe/lp_state_setup.c index 9f385a084e7..57a4b43bdc3 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_setup.c +++ b/src/gallium/drivers/llvmpipe/lp_state_setup.c @@ -111,7 +111,7 @@ store_coef(struct gallivm_state *gallivm, -static void +static void emit_constant_coef4(struct gallivm_state *gallivm, struct lp_setup_args *args, unsigned slot, @@ -126,7 +126,7 @@ emit_constant_coef4(struct gallivm_state *gallivm, * Setup the fragment input attribute with the front-facing value. * \param frontface is the triangle front facing? */ -static void +static void emit_facing_coef(struct gallivm_state *gallivm, struct lp_setup_args *args, unsigned slot ) @@ -257,7 +257,7 @@ lp_do_offset_tri(struct gallivm_state *gallivm, /* mult = MAX2(dzdx, dzdy) * pgon_offset_scale */ max = LLVMBuildFCmp(b, LLVMRealUGT, dzdx, dzdy, ""); - max_value = LLVMBuildSelect(b, max, dzdx, dzdy, "max"); + max_value = LLVMBuildSelect(b, max, dzdx, dzdy, "max"); mult = LLVMBuildFMul(b, max_value, lp_build_const_float(gallivm, key->pgon_offset_scale), ""); @@ -367,7 +367,7 @@ load_attribute(struct gallivm_state *gallivm, * sometimes completely in case of tris covering a block fully, * which obviously wouldn't work)). */ -static void +static void calc_coef4( struct gallivm_state *gallivm, struct lp_setup_args *args, LLVMValueRef a0, @@ -425,7 +425,7 @@ emit_coef4( struct gallivm_state *gallivm, } -static void +static void emit_linear_coef( struct gallivm_state *gallivm, struct lp_setup_args *args, unsigned slot, @@ -433,7 +433,7 @@ emit_linear_coef( struct gallivm_state *gallivm, { /* nothing to do anymore */ emit_coef4(gallivm, - args, slot, + args, slot, attribv[0], attribv[1], attribv[2]); @@ -448,7 +448,7 @@ emit_linear_coef( struct gallivm_state *gallivm, * Later, when we compute the value at a particular fragment position we'll * divide the interpolated value by the interpolated W at that fragment. */ -static void +static void apply_perspective_corr( struct gallivm_state *gallivm, struct lp_setup_args *args, unsigned slot, @@ -474,7 +474,7 @@ apply_perspective_corr( struct gallivm_state *gallivm, /** * Compute the inputs-> dadx, dady, a0 values. */ -static void +static void emit_tri_coef( struct gallivm_state *gallivm, const struct lp_setup_variant_key *key, struct lp_setup_args *args) diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.h b/src/gallium/drivers/llvmpipe/lp_state_setup.h index a92a9e7f288..ee11c3c061a 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_setup.h +++ b/src/gallium/drivers/llvmpipe/lp_state_setup.h @@ -57,7 +57,7 @@ typedef void (*lp_jit_setup_triangle)( const float (*v0)[4], */ struct lp_setup_variant { struct lp_setup_variant_key key; - + struct lp_setup_variant_list_item list_item_global; struct gallivm_state *gallivm; diff --git a/src/gallium/drivers/llvmpipe/lp_texture.c b/src/gallium/drivers/llvmpipe/lp_texture.c index 8555b9ec761..023eef29c56 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.c +++ b/src/gallium/drivers/llvmpipe/lp_texture.c @@ -1,8 +1,8 @@ /************************************************************************** - * + * * Copyright 2006 VMware, Inc. * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -10,11 +10,11 @@ * distribute, sub license, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. @@ -22,7 +22,7 @@ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * + * **************************************************************************/ /* * Authors: @@ -343,7 +343,7 @@ llvmpipe_memobj_create_from_handle(struct pipe_screen *pscreen, #ifdef PIPE_MEMORY_FD struct llvmpipe_memory_object *memobj = CALLOC_STRUCT(llvmpipe_memory_object); - if (handle->type == WINSYS_HANDLE_TYPE_FD && + if (handle->type == WINSYS_HANDLE_TYPE_FD && pscreen->import_memory_fd(pscreen, handle->handle, &memobj->data, &memobj->size)) { return &memobj->b; }
