Merge "Use -Werror in frameworks/native/opengl/libagl" am: d4f0d3a4d2 am: fe805e8913

am: b60bde6ffc

Change-Id: Id1bc17bb6a0bf14209eef1b0b4434057d2e505c5

1 files changed, 1 insertions, 3 deletions

diff --git a/opengl/libagl/array.cpp b/opengl/libagl/array.cpp
index 54207fa212..2d36c6194e 100644
--- a/opengl/libagl/array.cpp
+++ b/opengl/libagl/array.cpp
@@ -136,9 +136,6 @@ void ogles_uninit_array(ogles_context_t* c)
 static void currentColor(ogles_context_t* c, GLfixed* v, const GLvoid*) {
     memcpy(v, c->current.color.v, sizeof(vec4_t));
 }
-static void currentColor_clamp(ogles_context_t* c, GLfixed* v, const GLvoid*) {
-    memcpy(v, c->currentColorClamped.v, sizeof(vec4_t));
-}
 static void currentNormal(ogles_context_t* c, GLfixed* v, const GLvoid*) {
     memcpy(v, c->currentNormal.v, sizeof(vec3_t));
 }
@@ -349,6 +346,7 @@ void vertex_cache_t::init()
 {
     // make sure the size of vertex_t allows cache-line alignment
     CTA<(sizeof(vertex_t) & 0x1F) == 0> assertAlignedSize;
+    (void)assertAlignedSize; // suppress unused warning.
 
     const int align = 32;
     const size_t s = VERTEX_BUFFER_SIZE + VERTEX_CACHE_SIZE;