From d7787808c8359cd5a13c5f5de9303f8e4d4375ad Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 20 Mar 2019 16:16:20 +0000 Subject: [PATCH] virglrenderer: kill off trailing whitespace sed -i "s/[[:space:]]*$//g" */*.[ch] Note: there's a handful more in src/gallium, although that's left as-is to minimise merge conflicts as we have to port things from Mesa. Signed-off-by: Emil Velikov Reviewed-by: Chia-I Wu --- src/iov.c | 20 ++++++++++---------- src/virgl_hw.h | 2 +- tests/test_virgl_cmd.c | 14 +++++++------- tests/test_virgl_init.c | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/iov.c b/src/iov.c index 9f9df91..0ee58b2 100644 --- a/src/iov.c +++ b/src/iov.c @@ -14,16 +14,16 @@ // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright // notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. +// documentation and/or other materials provided with the distribution. // 3. Neither the name of the project nor the names of its contributors // may be used to endorse or promote products derived from this software -// without specific prior written permission. -// +// without specific prior written permission. +// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND // ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -33,9 +33,9 @@ // OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) // HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT // LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +// OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF // SUCH DAMAGE. -// +// #include #include @@ -65,7 +65,7 @@ size_t vrend_read_from_iovec(const struct iovec *iov, int iovlen, while (count > 0 && iovlen > 0) { if (iov->iov_len > offset) { len = iov->iov_len - offset; - + if (count < len) len = count; memcpy(buf, (char*)iov->iov_base + offset, len); @@ -123,7 +123,7 @@ size_t vrend_read_from_iovec_cb(const struct iovec *iov, int iovlen, while (count > 0 && iovlen > 0) { if (iov->iov_len > offset) { len = iov->iov_len - offset; - + if (count < len) len = count; (*iocb)(cookie, read, (char*)iov->iov_base + offset, len); diff --git a/src/virgl_hw.h b/src/virgl_hw.h index 836edf8..48b8d65 100644 --- a/src/virgl_hw.h +++ b/src/virgl_hw.h @@ -405,7 +405,7 @@ enum virgl_ctx_errors { VIRGL_ERROR_CTX_ILLEGAL_VERTEX_FORMAT, VIRGL_ERROR_CTX_ILLEGAL_CMD_BUFFER, VIRGL_ERROR_CTX_GLES_HAVE_TES_BUT_MISS_TCS, -}; +}; #define VIRGL_RESOURCE_Y_0_TOP (1 << 0) #endif diff --git a/tests/test_virgl_cmd.c b/tests/test_virgl_cmd.c index 4a96dfc..de9a7a7 100644 --- a/tests/test_virgl_cmd.c +++ b/tests/test_virgl_cmd.c @@ -41,7 +41,7 @@ START_TEST(virgl_test_overlap_obj_id) struct virgl_context ctx; int ctx_handle = 1; ret = testvirgl_init_ctx_cmdbuf(&ctx); - ck_assert_int_eq(ret, 0); + ck_assert_int_eq(ret, 0); /* set blend state */ { @@ -78,14 +78,14 @@ START_TEST(virgl_test_clear) struct virgl_box box; int ret; int i; - + ret = testvirgl_init_ctx_cmdbuf(&ctx); - ck_assert_int_eq(ret, 0); + ck_assert_int_eq(ret, 0); /* init and create simple 2D resource */ ret = testvirgl_create_backed_simple_2d_res(&res, 1, 50, 50); ck_assert_int_eq(ret, 0); - + /* attach resource to context */ virgl_renderer_ctx_attach_resource(ctx.ctx_id, res.handle); @@ -137,7 +137,7 @@ START_TEST(virgl_test_clear) testvirgl_fini_ctx_cmdbuf(&ctx); } -END_TEST +END_TEST START_TEST(virgl_test_blit_simple) { @@ -741,8 +741,8 @@ START_TEST(virgl_test_render_geom_simple) } END_TEST -/* create a resource - clear it to a color, render something - * and test transform feedback +/* create a resource - clear it to a color, render something + * and test transform feedback */ START_TEST(virgl_test_render_xfb) { diff --git a/tests/test_virgl_init.c b/tests/test_virgl_init.c index 55763a3..56da937 100644 --- a/tests/test_virgl_init.c +++ b/tests/test_virgl_init.c @@ -153,7 +153,7 @@ START_TEST(virgl_init_egl_create_ctx_create_bind_res_illegal_ctx) { int ret; struct virgl_renderer_resource_create_args res; - + testvirgl_init_simple_1d_resource(&res, 1); ret = virgl_renderer_resource_create(&res, NULL, 0);