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

Commit 9a9a1f4b authored by Cody Northrop's avatar Cody Northrop
Browse files

Call down the chain for eglGetError 

Test: cts-tradefed run singleCommand cts -m CtsGpuToolsHostTestCases
Test: Chromium starts up
Test: CtsDeqpTestCases:include-filter:dEQP-EGL.*
Test: CtsDeqpTestCases:include-filter:dEQP-GLES2.*
Test: CtsDeqpTestCases:include-filter:dEQP-GLES3.*
Test: CtsDeqpTestCases:include-filter:dEQP-GLES31.*
Bug: 110883880
Change-Id: I150113a05df8a2f60e3297a152e738d74ce3f51b
parent 9d5d33d6

opengl/libs/EGL/eglApi.cpp

+1 −5
Original line number Original line Diff line number Diff line
@@ -200,11 +200,7 @@ EGLBoolean eglWaitNative(EGLint engine) { 




EGLint eglGetError(void) {

EGLint eglGetError(void) {

    egl_connection_t* const cnx = &gEGLImpl;

    egl_connection_t* const cnx = &gEGLImpl;

    if (cnx->platform.eglGetError) {

    return cnx->platform.eglGetError();

    return cnx->platform.eglGetError();

    } else {

        return egl_tls_t::getError();

    }

}

}





__eglMustCastToProperFunctionPointerType eglGetProcAddress(const char* procname) {

__eglMustCastToProperFunctionPointerType eglGetProcAddress(const char* procname) {

opengl/libs/EGL/egl_platform_entries.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ typedef __eglMustCastToProperFunctionPointerType EGLFuncPointer; 




namespace android {

namespace android {





EGLint eglGetErrorImpl();

EGLFuncPointer FindPlatformImplAddr(const char* name);

EGLFuncPointer FindPlatformImplAddr(const char* name);





}; // namespace android

}; // namespace android

opengl/libs/EGL/egl_tls.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <cutils/properties.h>

#include <cutils/properties.h>

#include <log/log.h>

#include <log/log.h>

#include "CallStack.h"

#include "CallStack.h"

#include "egl_platform_entries.h"





namespace android {

namespace android {
@@ -137,7 +138,7 @@ void egl_tls_t::clearTLS() { 
void egl_tls_t::clearError() {

void egl_tls_t::clearError() {

    // This must clear the error from all the underlying EGL implementations as

    // This must clear the error from all the underlying EGL implementations as

    // well as the EGL wrapper layer.

    // well as the EGL wrapper layer.

    eglGetError();

    android::eglGetErrorImpl();

}

}





EGLint egl_tls_t::getError() {

EGLint egl_tls_t::getError() {