aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-08-27 10:22:14 +0200
committermarha <marha@users.sourceforge.net>2013-08-27 10:22:14 +0200
commitac46cfda36d6dbe8d5c092124a66ffe3f2bad15f (patch)
treed1c2c7015f94e4cff6ed4124fa88913e02da2cca /mesalib/src/mesa/main
parent427be67230f799417f3c364525484263d85cb17d (diff)
parent84e570d071a041f85e2e8b92963d3390d14af5fc (diff)
downloadvcxsrv-ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f.tar.gz
vcxsrv-ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f.tar.bz2
vcxsrv-ac46cfda36d6dbe8d5c092124a66ffe3f2bad15f.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesalib git update 27 aug 2013
Diffstat (limited to 'mesalib/src/mesa/main')
-rw-r--r--mesalib/src/mesa/main/macros.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h
index ddfeee226..1052f7560 100644
--- a/mesalib/src/mesa/main/macros.h
+++ b/mesalib/src/mesa/main/macros.h
@@ -607,7 +607,8 @@ COPY_CLEAN_4V_TYPE_AS_FLOAT(GLfloat dst[4], int sz, const GLfloat src[4],
UINT_AS_FLT(0), UINT_AS_FLT(1));
break;
default:
- ASSERT(0);
+ ASSIGN_4V(dst, 0.0f, 0.0f, 0.0f, 1.0f); /* silence warnings */
+ ASSERT(!"Unexpected type in COPY_CLEAN_4V_TYPE_AS_FLOAT macro");
}
COPY_SZ_4V(dst, sz, src);
}