Mesa (master): nv50: Silence incompatible pointer type initialization warning.

Vinson Lee vlee at kemper.freedesktop.org
Sun Aug 22 05:02:14 UTC 2010


Module: Mesa
Branch: master
Commit: 4a06525737c17126243a48741c87298ad1ffd076
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a06525737c17126243a48741c87298ad1ffd076

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Aug 21 22:01:04 2010 -0700

nv50: Silence incompatible pointer type initialization warning.

Silence the following GCC warning.
warning: initialization from incompatible pointer type

---

 src/gallium/drivers/nv50/nv50_push.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_push.c b/src/gallium/drivers/nv50/nv50_push.c
index 6a2ffd5..57c0010 100644
--- a/src/gallium/drivers/nv50/nv50_push.c
+++ b/src/gallium/drivers/nv50/nv50_push.c
@@ -108,8 +108,9 @@ emit_vertex(struct push_context *ctx, unsigned n)
    int i;
 
    if (ctx->edgeflag_attr < 16) {
-      float *edgeflag = (uint8_t *)ctx->attr[ctx->edgeflag_attr].map +
-                        ctx->attr[ctx->edgeflag_attr].stride * n;
+      float *edgeflag = (float *)
+         ((uint8_t *)ctx->attr[ctx->edgeflag_attr].map +
+          ctx->attr[ctx->edgeflag_attr].stride * n);
 
       if (*edgeflag != ctx->edgeflag) {
          BEGIN_RING(chan, tesla, NV50TCL_EDGEFLAG_ENABLE, 1);




More information about the mesa-commit mailing list