From 9ab5f4f1e533fb4d3fc7ec115cae796151dbb04d Mon Sep 17 00:00:00 2001
From: jmcmullan <jmcmullan@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Sat, 4 Oct 2014 04:51:07 +0000
Subject: [PATCH] mesa: Compiler delint

Signed-off-by: Jason S. McMullan <jason.mcmullan@gmail.com>

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49691 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 workbench/libs/mesa/src/egl/main/eglimage.c                   | 2 +-
 workbench/libs/mesa/src/gallium/auxiliary/util/u_linkage.h    | 2 +-
 workbench/libs/mesa/src/gallium/state_trackers/vega/text.c    | 4 ++--
 workbench/libs/mesa/src/glsl/ir.h                             | 1 +
 workbench/libs/mesa/src/glsl/ir_validate.cpp                  | 2 +-
 workbench/libs/mesa/src/glu/sgi/libnurbs/internals/mapdesc.cc | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/workbench/libs/mesa/src/egl/main/eglimage.c b/workbench/libs/mesa/src/egl/main/eglimage.c
index 458a2e424d..72c05d9f80 100644
--- a/workbench/libs/mesa/src/egl/main/eglimage.c
+++ b/workbench/libs/mesa/src/egl/main/eglimage.c
@@ -48,7 +48,7 @@ _eglParseImageAttribList(_EGLImageAttribs *attrs, _EGLDisplay *dpy,
 
    (void) dpy;
 
-   memset(attrs, 0, sizeof(attrs));
+   memset(attrs, 0, sizeof(*attrs));
    attrs->ImagePreserved = EGL_FALSE;
    attrs->GLTextureLevel = 0;
    attrs->GLTextureZOffset = 0;
diff --git a/workbench/libs/mesa/src/gallium/auxiliary/util/u_linkage.h b/workbench/libs/mesa/src/gallium/auxiliary/util/u_linkage.h
index 43ec917fc8..8652447d4e 100644
--- a/workbench/libs/mesa/src/gallium/auxiliary/util/u_linkage.h
+++ b/workbench/libs/mesa/src/gallium/auxiliary/util/u_linkage.h
@@ -57,7 +57,7 @@ static INLINE void
 util_semantic_table_from_layout(unsigned char *table, unsigned char *layout, unsigned char first_slot_value, unsigned char num_slots)
 {
    int i;
-   memset(table, 0xff, sizeof(table));
+   memset(table, 0xff, sizeof(*table)*num_slots);
 
    for(i = 0; i < num_slots; ++i)
       table[layout[i]] = first_slot_value + i;
diff --git a/workbench/libs/mesa/src/gallium/state_trackers/vega/text.c b/workbench/libs/mesa/src/gallium/state_trackers/vega/text.c
index 6714ee9ad3..f9de6a565b 100644
--- a/workbench/libs/mesa/src/gallium/state_trackers/vega/text.c
+++ b/workbench/libs/mesa/src/gallium/state_trackers/vega/text.c
@@ -73,8 +73,8 @@ static void add_glyph(struct vg_font *font,
    glyph = CALLOC_STRUCT(vg_glyph);
    glyph->object = obj;
    glyph->is_hinted = isHinted;
-   memcpy(glyph->glyph_origin, glyphOrigin, sizeof(glyphOrigin));
-   memcpy(glyph->escapement, escapement, sizeof(escapement));
+   memcpy(glyph->glyph_origin, glyphOrigin, sizeof(glyphOrigin[0])*2);
+   memcpy(glyph->escapement, escapement, sizeof(escapement[0])*2);
 
    cso_hash_insert(font->glyphs, (unsigned) glyphIndex, glyph);
 }
diff --git a/workbench/libs/mesa/src/glsl/ir.h b/workbench/libs/mesa/src/glsl/ir.h
index adafec35ca..46954cf13b 100644
--- a/workbench/libs/mesa/src/glsl/ir.h
+++ b/workbench/libs/mesa/src/glsl/ir.h
@@ -136,6 +136,7 @@ protected:
       ir_type = ir_type_unset;
       type = NULL;
    }
+   virtual ~ir_instruction() { }
 };
 
 
diff --git a/workbench/libs/mesa/src/glsl/ir_validate.cpp b/workbench/libs/mesa/src/glsl/ir_validate.cpp
index 7b1c19d65a..58a0783506 100644
--- a/workbench/libs/mesa/src/glsl/ir_validate.cpp
+++ b/workbench/libs/mesa/src/glsl/ir_validate.cpp
@@ -447,7 +447,7 @@ ir_validate::visit_leave(ir_expression *ir)
 ir_visitor_status
 ir_validate::visit_leave(ir_swizzle *ir)
 {
-   int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w};
+   unsigned int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w};
 
    for (unsigned int i = 0; i < ir->type->vector_elements; i++) {
       if (chans[i] >= ir->val->type->vector_elements) {
diff --git a/workbench/libs/mesa/src/glu/sgi/libnurbs/internals/mapdesc.cc b/workbench/libs/mesa/src/glu/sgi/libnurbs/internals/mapdesc.cc
index d59f8fd395..7e77f9b9ff 100644
--- a/workbench/libs/mesa/src/glu/sgi/libnurbs/internals/mapdesc.cc
+++ b/workbench/libs/mesa/src/glu/sgi/libnurbs/internals/mapdesc.cc
@@ -90,7 +90,7 @@ Mapdesc::setBboxsize( INREAL *mat )
 void
 Mapdesc::identify( REAL dest[MAXCOORDS][MAXCOORDS] )
 {
-    memset( dest, 0, sizeof( dest ) );
+    memset( dest, 0, sizeof( dest[0][0] ) * MAXCOORDS * MAXCOORDS );
     for( int i=0; i != hcoords; i++ )
 	dest[i][i] = 1.0;
 }
-- 
2.11.4.GIT