From 67a34ac1d28c63dde43fbb233035ac4208cc8abe Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 21 Oct 2024 06:04:15 +0200 Subject: [PATCH] build: Fix MSVC warning about type mismatch G_STRUCT_OFFSET() returns a long. long is a 32bit type on 64bit Windows. Casting int to pointer of different size causes a warning. --- gsk/gl/gskglcommandqueue.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gsk/gl/gskglcommandqueue.c b/gsk/gl/gskglcommandqueue.c index 4421cf02a0..ae4ee16686 100644 --- a/gsk/gl/gskglcommandqueue.c +++ b/gsk/gl/gskglcommandqueue.c @@ -1087,25 +1087,25 @@ gsk_gl_command_queue_execute (GskGLCommandQueue *self, glEnableVertexAttribArray (0); glVertexAttribPointer (0, 2, GL_FLOAT, GL_FALSE, sizeof (GskGLDrawVertex), - (void *) G_STRUCT_OFFSET (GskGLDrawVertex, position)); + GSIZE_TO_POINTER ((gsize) G_STRUCT_OFFSET (GskGLDrawVertex, position))); /* 1 = texture coord location */ glEnableVertexAttribArray (1); glVertexAttribPointer (1, 2, GL_FLOAT, GL_FALSE, sizeof (GskGLDrawVertex), - (void *) G_STRUCT_OFFSET (GskGLDrawVertex, uv)); + GSIZE_TO_POINTER ((gsize) G_STRUCT_OFFSET (GskGLDrawVertex, uv))); /* 2 = color location */ glEnableVertexAttribArray (2); glVertexAttribPointer (2, 4, GL_HALF_FLOAT, GL_FALSE, sizeof (GskGLDrawVertex), - (void *) G_STRUCT_OFFSET (GskGLDrawVertex, color)); + GSIZE_TO_POINTER ((gsize) G_STRUCT_OFFSET (GskGLDrawVertex, color))); /* 3 = color2 location */ glEnableVertexAttribArray (3); glVertexAttribPointer (3, 4, GL_HALF_FLOAT, GL_FALSE, sizeof (GskGLDrawVertex), - (void *) G_STRUCT_OFFSET (GskGLDrawVertex, color2)); + GSIZE_TO_POINTER ((gsize) G_STRUCT_OFFSET (GskGLDrawVertex, color2))); /* Setup initial scissor clip */ if (scissor != NULL && cairo_region_num_rectangles (scissor) > 0)