diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-27 10:17:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-27 10:17:25 +0200 |
| commit | 84e570d071a041f85e2e8b92963d3390d14af5fc (patch) | |
| tree | 22865391119b41af082d889f8db1f68c23a9c5c4 /mesalib/src/mesa | |
| parent | 5ee5b91b019005aa27273dff01388a68c12be293 (diff) | |
| download | vcxsrv-84e570d071a041f85e2e8b92963d3390d14af5fc.tar.gz vcxsrv-84e570d071a041f85e2e8b92963d3390d14af5fc.tar.bz2 vcxsrv-84e570d071a041f85e2e8b92963d3390d14af5fc.zip | |
fontconfig mesalib git update 27 aug 2013
fontconfig commit c6228f8091ab91b67ea006ad5a1b1da97b3d4a5a
mesa commit d8ac987f6ab228df1a478b36c3d889992754374f
Diffstat (limited to 'mesalib/src/mesa')
| -rw-r--r-- | mesalib/src/mesa/main/macros.h | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texfilter.c | 1 |
2 files changed, 3 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); } diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c index 0920a640c..312b9ce9b 100644 --- a/mesalib/src/mesa/swrast/s_texfilter.c +++ b/mesalib/src/mesa/swrast/s_texfilter.c @@ -274,6 +274,7 @@ linear_texel_locations(GLenum wrapMode, break; default: _mesa_problem(NULL, "Bad wrap mode"); + *i0 = *i1 = 0; u = 0.0F; break; } |