diff --git a/src/gallium/drivers/llvmpipe/lp_rast_linear.c b/src/gallium/drivers/llvmpipe/lp_rast_linear.c
index 9cd354acb2e..16a13214137 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast_linear.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast_linear.c
@@ -87,9 +87,9 @@ lp_rast_linear_tile(struct lp_rasterizer_task *task,
                                    task->y,
                                    task->width,
                                    task->height,
-                                   (const float (*)[4])GET_A0(inputs),
-                                   (const float (*)[4])GET_DADX(inputs),
-                                   (const float (*)[4])GET_DADY(inputs),
+                                   GET_A0(inputs),
+                                   GET_DADX(inputs),
+                                   GET_DADY(inputs),
                                    scene->cbufs[0].map,
                                    scene->cbufs[0].stride))
          return;
@@ -101,9 +101,9 @@ lp_rast_linear_tile(struct lp_rasterizer_task *task,
                               task->y,
                               task->width,
                               task->height,
-                              (const float (*)[4])GET_A0(inputs),
-                              (const float (*)[4])GET_DADX(inputs),
-                              (const float (*)[4])GET_DADY(inputs),
+                              GET_A0(inputs),
+                              GET_DADX(inputs),
+                              GET_DADY(inputs),
                               scene->cbufs[0].map,
                               scene->cbufs[0].stride))
          return;
@@ -155,9 +155,9 @@ lp_rast_linear_rect(struct lp_rasterizer_task *task,
       if (variant->jit_linear_blit(state,
                                    box.x0, box.y0,
                                    width, height,
-                                   (const float (*)[4])GET_A0(inputs),
-                                   (const float (*)[4])GET_DADX(inputs),
-                                   (const float (*)[4])GET_DADY(inputs),
+                                   GET_A0(inputs),
+                                   GET_DADX(inputs),
+                                   GET_DADY(inputs),
                                    scene->cbufs[0].map,
                                    scene->cbufs[0].stride)) {
          return;
@@ -168,9 +168,9 @@ lp_rast_linear_rect(struct lp_rasterizer_task *task,
       if (variant->jit_linear(state,
                               box.x0, box.y0,
                               width, height,
-                              (const float (*)[4])GET_A0(inputs),
-                              (const float (*)[4])GET_DADX(inputs),
-                              (const float (*)[4])GET_DADY(inputs),
+                              GET_A0(inputs),
+                              GET_DADX(inputs),
+                              GET_DADY(inputs),
                               scene->cbufs[0].map,
                               scene->cbufs[0].stride)) {
          return;
diff --git a/src/gallium/drivers/llvmpipe/lp_setup_tri.c b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
index d9bd401dfb2..00f07beba48 100644
--- a/src/gallium/drivers/llvmpipe/lp_setup_tri.c
+++ b/src/gallium/drivers/llvmpipe/lp_setup_tri.c
@@ -457,9 +457,9 @@ do_triangle_ccw(struct lp_setup_context *setup,
 
    if (0)
       lp_dump_setup_coef(&setup->setup.variant->key,
-                         (const float (*)[4])GET_A0(&tri->inputs),
-                         (const float (*)[4])GET_DADX(&tri->inputs),
-                         (const float (*)[4])GET_DADY(&tri->inputs));
+                         GET_A0(&tri->inputs),
+                         GET_DADX(&tri->inputs),
+                         GET_DADY(&tri->inputs));
 
    struct lp_rast_plane *plane = GET_PLANES(tri);