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

Commit cb2609c0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Iac7c5867,I7aae05f7 

* changes:
  Fix unused parameter warning
  Print ImplementationANDROID extensions as well
parents 084519e3 10d17f78

opengl/tests/configdump/configdump.cpp

+1 −2
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ Attribute attributes[] = { 
};

// clang-format on



int main(int argc, char** argv)

{

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

    EGLConfig* configs;

    EGLint n;

opengl/tests/gl2_basic/gl2_basic.cpp

+4 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <EGLUtils.h>



using namespace android;

EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);



static void printGLString(const char *name, GLenum s) {

    // fprintf(stderr, "printGLString %s, %d\n", name, s);
@@ -46,7 +47,8 @@ static void printGLString(const char *name, GLenum s) { 


static void printEGLString(EGLDisplay dpy, const char *name, GLenum s) {

    const char *v = (const char *) eglQueryString(dpy, s);

    fprintf(stderr, "GL %s = %s\n", name, v);

    const char* va = (const char*)eglQueryStringImplementationANDROID(dpy, s);

    fprintf(stderr, "GL %s = %s\nImplementationANDROID: %s\n", name, v, va);

}



static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE) {
@@ -263,7 +265,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_yuvtex/gl2_yuvtex.cpp

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ void printEGLConfiguration(EGLDisplay dpy, EGLConfig config) { 
    printf("\n");

}



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

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

    EGLBoolean returnValue;

    EGLConfig myConfig = {0};

opengl/tests/gl_yuvtex/gl_yuvtex.cpp

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ void printEGLConfiguration(EGLDisplay dpy, EGLConfig config) { 
    printf("\n");

}



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

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

    EGLBoolean returnValue;

    EGLConfig myConfig = {0};