diff options
author | Brian Paul <[email protected]> | 2013-08-23 15:32:28 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2013-08-26 12:52:06 -0600 |
commit | ef47ab520d5f4b50073cb05df0504daaf4b6fcf2 (patch) | |
tree | 7144c3a381aae343abb7ecf39987fc100488ff93 /src/mesa/main | |
parent | f91f6ef739185086b3bbfbf67a15edb1d9a304f4 (diff) |
mesa: init dst values in COPY_CLEAN_4V_TYPE_AS_FLOAT()
to silence gcc 4.8.1 warnings. And improve the ASSERT(0) call.
Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r-- | src/mesa/main/macros.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index ddfeee22622..1052f756074 100644 --- a/src/mesa/main/macros.h +++ b/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); } |