Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b60bde6f authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

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

am: fe805e89

Change-Id: Icb4254fabad368dbe5ea7fa534300e69e4027faf
parents ceeb154b fe805e89

opengl/libagl/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ LOCAL_CFLAGS_mips += -fstrict-aliasing 
# The graphics code can generate division by zero

LOCAL_CFLAGS_mips += -mno-check-zero-division



LOCAL_CFLAGS += -Wall -Werror



# we need to access the private Bionic header <bionic_tls.h>

LOCAL_C_INCLUDES += bionic/libc/private

opengl/libagl/array.cpp

+1 −3
Original line number Diff line number Diff line
@@ -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;

opengl/libagl/egl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ namespace android { 


const unsigned int NUM_DISPLAYS = 1;



#ifndef __ANDROID__

static pthread_mutex_t gInitMutex = PTHREAD_MUTEX_INITIALIZER;

#endif

static pthread_mutex_t gErrorKeyMutex = PTHREAD_MUTEX_INITIALIZER;

static pthread_key_t gEGLErrorKey = -1;

#ifndef __ANDROID__
@@ -1776,7 +1778,6 @@ EGLBoolean eglMakeCurrent( EGLDisplay dpy, EGLSurface draw, 
        // if we're detaching, we need the current context

        current_ctx = (EGLContext)getGlThreadSpecific();

    } else {

        egl_context_t* c = egl_context_t::context(ctx);

        egl_surface_t* d = (egl_surface_t*)draw;

        egl_surface_t* r = (egl_surface_t*)read;

        if ((d && d->ctx && d->ctx != ctx) ||

opengl/libagl/light.cpp

+0 −1
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ static void lightx(GLenum i, GLenum pname, GLfixed param, ogles_context_t* c) 
    }



    light_t& light = c->lighting.lights[i-GL_LIGHT0];

    const GLfixed kDegToRad = GLfixed((M_PI * gglIntToFixed(1)) / 180.0f);

    switch (pname) {

    case GL_SPOT_EXPONENT:

        if (GGLfixed(param) >= gglIntToFixed(128)) {

opengl/libagl/matrix.cpp

+0 −11
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ static const matrixx_t gIdentityx = { 
static void point2__nop(transform_t const*, vec4_t* c, vec4_t const* o);

static void point3__nop(transform_t const*, vec4_t* c, vec4_t const* o);

static void point4__nop(transform_t const*, vec4_t* c, vec4_t const* o);

static void normal__nop(transform_t const*, vec4_t* c, vec4_t const* o);

static void point2__generic(transform_t const*, vec4_t* c, vec4_t const* o);

static void point3__generic(transform_t const*, vec4_t* c, vec4_t const* o);

static void point4__generic(transform_t const*, vec4_t* c, vec4_t const* o);
@@ -524,16 +523,6 @@ void transform_state_t::update_mvp() 
    }

}



static inline 

GLfloat det22(GLfloat a, GLfloat b, GLfloat c, GLfloat d) {

    return a*d - b*c;

}



static inline

GLfloat ndet22(GLfloat a, GLfloat b, GLfloat c, GLfloat d) {

    return b*c - a*d;

}



static __attribute__((noinline))

void invert(GLfloat* inverse, const GLfloat* src)

{