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 <emil.velikov@collabora.com>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
macos/master
Emil Velikov 6 years ago
parent bf043b3e56
commit d7787808c8
  1. 20
      src/iov.c
  2. 2
      src/virgl_hw.h
  3. 14
      tests/test_virgl_cmd.c
  4. 2
      tests/test_virgl_init.c

@ -14,16 +14,16 @@
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions // modification, are permitted provided that the following conditions
// are met: // are met:
// //
// 1. Redistributions of source code must retain the above copyright // 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer. // notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright // 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the // 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 // 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 // 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 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE // ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE // 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) // OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT // HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY // 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. // SUCH DAMAGE.
// //
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@ -65,7 +65,7 @@ size_t vrend_read_from_iovec(const struct iovec *iov, int iovlen,
while (count > 0 && iovlen > 0) { while (count > 0 && iovlen > 0) {
if (iov->iov_len > offset) { if (iov->iov_len > offset) {
len = iov->iov_len - offset; len = iov->iov_len - offset;
if (count < len) len = count; if (count < len) len = count;
memcpy(buf, (char*)iov->iov_base + offset, len); 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) { while (count > 0 && iovlen > 0) {
if (iov->iov_len > offset) { if (iov->iov_len > offset) {
len = iov->iov_len - offset; len = iov->iov_len - offset;
if (count < len) len = count; if (count < len) len = count;
(*iocb)(cookie, read, (char*)iov->iov_base + offset, len); (*iocb)(cookie, read, (char*)iov->iov_base + offset, len);

@ -405,7 +405,7 @@ enum virgl_ctx_errors {
VIRGL_ERROR_CTX_ILLEGAL_VERTEX_FORMAT, VIRGL_ERROR_CTX_ILLEGAL_VERTEX_FORMAT,
VIRGL_ERROR_CTX_ILLEGAL_CMD_BUFFER, VIRGL_ERROR_CTX_ILLEGAL_CMD_BUFFER,
VIRGL_ERROR_CTX_GLES_HAVE_TES_BUT_MISS_TCS, VIRGL_ERROR_CTX_GLES_HAVE_TES_BUT_MISS_TCS,
}; };
#define VIRGL_RESOURCE_Y_0_TOP (1 << 0) #define VIRGL_RESOURCE_Y_0_TOP (1 << 0)
#endif #endif

@ -41,7 +41,7 @@ START_TEST(virgl_test_overlap_obj_id)
struct virgl_context ctx; struct virgl_context ctx;
int ctx_handle = 1; int ctx_handle = 1;
ret = testvirgl_init_ctx_cmdbuf(&ctx); ret = testvirgl_init_ctx_cmdbuf(&ctx);
ck_assert_int_eq(ret, 0); ck_assert_int_eq(ret, 0);
/* set blend state */ /* set blend state */
{ {
@ -78,14 +78,14 @@ START_TEST(virgl_test_clear)
struct virgl_box box; struct virgl_box box;
int ret; int ret;
int i; int i;
ret = testvirgl_init_ctx_cmdbuf(&ctx); ret = testvirgl_init_ctx_cmdbuf(&ctx);
ck_assert_int_eq(ret, 0); ck_assert_int_eq(ret, 0);
/* init and create simple 2D resource */ /* init and create simple 2D resource */
ret = testvirgl_create_backed_simple_2d_res(&res, 1, 50, 50); ret = testvirgl_create_backed_simple_2d_res(&res, 1, 50, 50);
ck_assert_int_eq(ret, 0); ck_assert_int_eq(ret, 0);
/* attach resource to context */ /* attach resource to context */
virgl_renderer_ctx_attach_resource(ctx.ctx_id, res.handle); virgl_renderer_ctx_attach_resource(ctx.ctx_id, res.handle);
@ -137,7 +137,7 @@ START_TEST(virgl_test_clear)
testvirgl_fini_ctx_cmdbuf(&ctx); testvirgl_fini_ctx_cmdbuf(&ctx);
} }
END_TEST END_TEST
START_TEST(virgl_test_blit_simple) START_TEST(virgl_test_blit_simple)
{ {
@ -741,8 +741,8 @@ START_TEST(virgl_test_render_geom_simple)
} }
END_TEST END_TEST
/* create a resource - clear it to a color, render something /* create a resource - clear it to a color, render something
* and test transform feedback * and test transform feedback
*/ */
START_TEST(virgl_test_render_xfb) START_TEST(virgl_test_render_xfb)
{ {

@ -153,7 +153,7 @@ START_TEST(virgl_init_egl_create_ctx_create_bind_res_illegal_ctx)
{ {
int ret; int ret;
struct virgl_renderer_resource_create_args res; struct virgl_renderer_resource_create_args res;
testvirgl_init_simple_1d_resource(&res, 1); testvirgl_init_simple_1d_resource(&res, 1);
ret = virgl_renderer_resource_create(&res, NULL, 0); ret = virgl_renderer_resource_create(&res, NULL, 0);

Loading…
Cancel
Save