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

Commit 2df83399 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix trivial compiler warnings"

parents 01d0be16 11e77b52

opengl/tests/angeles/demo.c

+2 −2
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static void drawFadeQuad() 
// Called from the app framework.

void appInit()

{

    int a;

    unsigned int a;



    glEnable(GL_NORMALIZE);

    glEnable(GL_DEPTH_TEST);
@@ -492,7 +492,7 @@ void appInit() 
// Called from the app framework.

void appDeinit()

{

    int a;

    unsigned int a;

    for (a = 0; a < SUPERSHAPE_COUNT; ++a)

        freeGLObject(sSuperShapeObjects[a]);

    freeGLObject(sGroundPlane);

opengl/tests/fillrate/fillrate.cpp

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


using namespace android;



int main(int argc, char** argv)

int main(int /*argc*/, char** /*argv*/)

{

    EGLint configAttribs[] = {

         EGL_DEPTH_SIZE, 0,
@@ -153,7 +153,7 @@ int main(int argc, char** argv) 


     for (int c=1, j=0 ; c<32 ; c++, j++) {

         nsecs_t t = times[j];

         printf("%lld\t%d\t%f\n", t, c, (double(t)/c)/1000000.0);

         printf("%ld\t%d\t%f\n", t, c, (double(t)/c)/1000000.0);

     }

opengl/tests/finish/finish.cpp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


using namespace android;



int main(int argc, char** argv)

int main(int /*argc*/, char** /*argv*/)

{

    EGLint configAttribs[] = {

         EGL_DEPTH_SIZE, 0,

opengl/tests/gl2_copyTexImage/gl2_copyTexImage.cpp

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ int printEGLConfigurations(EGLDisplay dpy) { 
    return true;

}



int main(int argc, char** argv) {

int main(int /*argc*/, char** /*argv*/) {

    EGLBoolean returnValue;

    EGLConfig myConfig = {0};

opengl/tests/gl2_jni/jni/gl_code.cpp

+2 −2
Original line number Diff line number Diff line
@@ -153,12 +153,12 @@ extern "C" { 
    JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_step(JNIEnv * env, jobject obj);

};



JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_init(JNIEnv * env, jobject obj,  jint width, jint height)

JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_init(JNIEnv * /*env*/, jobject /*obj*/,  jint width, jint height)

{

    setupGraphics(width, height);

}



JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_step(JNIEnv * env, jobject obj)

JNIEXPORT void JNICALL Java_com_android_gl2jni_GL2JNILib_step(JNIEnv * /*env*/, jobject /*obj*/)

{

    renderFrame();

}