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

Commit 706e069c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 20677 

* changes:
  workaround a bug in the SGX driver that would prevent eglGetConfig to work properly
parents e55fd71b 1d3bcd6e

opengl/tests/angeles/app-linux.cpp

+2 −2
Original line number Diff line number Diff line
@@ -133,11 +133,11 @@ static int initGraphics() 
     EGLint w, h;

     EGLDisplay dpy;



     EGLNativeWindowType window = android_createDisplaySurface();

     

     dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);

     eglInitialize(dpy, &majorVersion, &minorVersion);

          

     EGLNativeWindowType window = android_createDisplaySurface();

     

     status_t err = EGLUtils::selectConfigForNativeWindow(

             dpy, configAttribs, window, &config);

     if (err) {

opengl/tests/copybits/copybits.cpp

+9 −5
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
#include <hardware/gralloc.h>

#include <hardware/hardware.h>



#include <ui/FramebufferNativeWindow.h>

#include <ui/EGLUtils.h>



#define EGL_EGLEXT_PROTOTYPES

#define GL_GLEXT_PROTOTYPES
@@ -32,8 +35,6 @@ 
#include <GLES/gl.h>

#include <GLES/glext.h>



extern "C" EGLNativeWindowType android_createDisplaySurface(void);



using namespace android;



EGLDisplay eglDisplay;
@@ -268,6 +269,8 @@ int init_gl_surface(void) 
            EGL_NONE

    };



    EGLNativeWindowType window = android_createDisplaySurface();



    printf("init_gl_surface\n");

    if ( (eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY)) == EGL_NO_DISPLAY )

    {
@@ -281,14 +284,15 @@ int init_gl_surface(void) 
        return 0;

    }



    if ( eglChooseConfig(eglDisplay, attrib, &myConfig, 1, &numConfigs) != EGL_TRUE )

    if ( EGLUtils::selectConfigForNativeWindow(eglDisplay, attrib, window, &myConfig) != 0)

    {

        printf("eglChooseConfig failed\n");

        printf("EGLUtils::selectConfigForNativeWindow failed\n");

        return 0;

    }

        



    if ( (eglSurface = eglCreateWindowSurface(eglDisplay, myConfig,

            android_createDisplaySurface(), 0)) == EGL_NO_SURFACE )

            window, 0)) == EGL_NO_SURFACE )

    {

        printf("eglCreateWindowSurface failed\n");

        return 0;

opengl/tests/fillrate/fillrate.cpp

+2 −2
Original line number Diff line number Diff line
@@ -45,11 +45,11 @@ int main(int argc, char** argv) 
     EGLint w, h;

     EGLDisplay dpy;



     EGLNativeWindowType window = android_createDisplaySurface();

     

     dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);

     eglInitialize(dpy, &majorVersion, &minorVersion);

          

     EGLNativeWindowType window = android_createDisplaySurface();

     

     status_t err = EGLUtils::selectConfigForNativeWindow(

             dpy, configAttribs, window, &config);

     if (err) {

opengl/tests/filter/filter.cpp

+5 −1
Original line number Diff line number Diff line
@@ -37,10 +37,14 @@ int main(int argc, char** argv) 
     

     EGLDisplay dpy;



     EGLNativeWindowType window = 0;

     if (!usePbuffer) {

         window = android_createDisplaySurface();

     }

     

     dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);

     eglInitialize(dpy, &majorVersion, &minorVersion);

     if (!usePbuffer) {

         EGLNativeWindowType window = android_createDisplaySurface();

         surface = eglCreateWindowSurface(dpy, config, window, NULL);

         EGLUtils::selectConfigForNativeWindow(

                 dpy, s_configAttribs, window, &config);

opengl/tests/finish/finish.cpp

+2 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ int main(int argc, char** argv) 
     EGLint w, h;

     EGLDisplay dpy;



     EGLNativeWindowType window = android_createDisplaySurface();

     

     dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);

     eglInitialize(dpy, &majorVersion, &minorVersion);

          

     EGLNativeWindowType window = android_createDisplaySurface();

     

     status_t err = EGLUtils::selectConfigForNativeWindow(

             dpy, configAttribs, window, &config);

     if (err) {