remove warnings
Test: compiled
Bug: cleanup
Change-Id: Ic7a189b4e2947b9552b00e5fa3c245d2505ab2a2
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index c375823..c434d0e 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -42,7 +42,6 @@
#include <utils/KeyedVector.h>
-#include <utils/SortedVector.h>
#include <utils/String8.h>
#include <utils/Trace.h>
@@ -84,6 +83,11 @@
*
* NOTE: Both strings MUST have a single space as the last character.
*/
+
+// CLion mistakenly warns about the extern keyword below.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wextern-initializer"
+
extern char const * const gBuiltinExtensionString =
"EGL_KHR_get_all_proc_addresses "
"EGL_ANDROID_presentation_time "
@@ -233,6 +237,8 @@
(__eglMustCastToProperFunctionPointerType)&eglGetFrameTimestampSupportedANDROID },
};
+#pragma clang diagnostic pop
+
/*
* These extensions entry-points should not be exposed to applications.
* They're used internally by the Android EGL layer.
@@ -304,7 +310,7 @@
clearError();
egl_display_ptr dp = get_display(dpy);
- if (!dp) return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ if (!dp) return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
EGLBoolean res = dp->initialize(major, minor);
@@ -320,7 +326,7 @@
clearError();
egl_display_ptr dp = get_display(dpy);
- if (!dp) return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ if (!dp) return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
EGLBoolean res = dp->terminate();
@@ -341,7 +347,7 @@
if (!dp) return EGL_FALSE;
if (num_config==0) {
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+ return setError(EGL_BAD_PARAMETER, (EGLBoolean)EGL_FALSE);
}
EGLBoolean res = EGL_FALSE;
@@ -366,7 +372,7 @@
if (!dp) return EGL_FALSE;
if (num_config==0) {
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+ return setError(EGL_BAD_PARAMETER, (EGLBoolean)EGL_FALSE);
}
EGLBoolean res = EGL_FALSE;
@@ -398,6 +404,8 @@
case EGL_CONFIG_CAVEAT:
attribCaveat = &attrib_list[attribCount];
break;
+ default:
+ break;
}
attribCount++;
}
@@ -627,7 +635,7 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t * const s = get_surface(surface);
EGLBoolean result = s->cnx->egl.eglDestroySurface(dp->disp.dpy, s->surface);
@@ -647,7 +655,7 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t const * const s = get_surface(surface);
return s->cnx->egl.eglQuerySurface(
@@ -666,7 +674,6 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get()) {
setError(EGL_BAD_SURFACE, EGL_FALSE);
- return;
}
}
@@ -725,7 +732,7 @@
ContextRef _c(dp.get(), ctx);
if (!_c.get())
- return setError(EGL_BAD_CONTEXT, EGL_FALSE);
+ return setError(EGL_BAD_CONTEXT, (EGLBoolean)EGL_FALSE);
egl_context_t * const c = get_context(ctx);
EGLBoolean result = c->cnx->egl.eglDestroyContext(dp->disp.dpy, c->context);
@@ -741,14 +748,14 @@
clearError();
egl_display_ptr dp = validate_display(dpy);
- if (!dp) return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ if (!dp) return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
// If ctx is not EGL_NO_CONTEXT, read is not EGL_NO_SURFACE, or draw is not
// EGL_NO_SURFACE, then an EGL_NOT_INITIALIZED error is generated if dpy is
// a valid but uninitialized display.
if ( (ctx != EGL_NO_CONTEXT) || (read != EGL_NO_SURFACE) ||
(draw != EGL_NO_SURFACE) ) {
- if (!dp->isReady()) return setError(EGL_NOT_INITIALIZED, EGL_FALSE);
+ if (!dp->isReady()) return setError(EGL_NOT_INITIALIZED, (EGLBoolean)EGL_FALSE);
}
// get a reference to the object passed in
@@ -759,7 +766,7 @@
// validate the context (if not EGL_NO_CONTEXT)
if ((ctx != EGL_NO_CONTEXT) && !_c.get()) {
// EGL_NO_CONTEXT is valid
- return setError(EGL_BAD_CONTEXT, EGL_FALSE);
+ return setError(EGL_BAD_CONTEXT, (EGLBoolean)EGL_FALSE);
}
// these are the underlying implementation's object
@@ -782,7 +789,7 @@
// no context given, use the implementation of the current context
if (draw != EGL_NO_SURFACE || read != EGL_NO_SURFACE) {
// calling eglMakeCurrent( ..., !=0, !=0, EGL_NO_CONTEXT);
- return setError(EGL_BAD_MATCH, EGL_FALSE);
+ return setError(EGL_BAD_MATCH, (EGLBoolean)EGL_FALSE);
}
if (cur_c == NULL) {
// no current context
@@ -793,14 +800,14 @@
// retrieve the underlying implementation's draw EGLSurface
if (draw != EGL_NO_SURFACE) {
- if (!_d.get()) return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ if (!_d.get()) return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
d = get_surface(draw);
impl_draw = d->surface;
}
// retrieve the underlying implementation's read EGLSurface
if (read != EGL_NO_SURFACE) {
- if (!_r.get()) return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ if (!_r.get()) return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
r = get_surface(read);
impl_read = r->surface;
}
@@ -824,7 +831,7 @@
} else {
// this will ALOGE the error
egl_connection_t* const cnx = &gEGLImpl;
- result = setError(cnx->egl.eglGetError(), EGL_FALSE);
+ result = setError(cnx->egl.eglGetError(), (EGLBoolean)EGL_FALSE);
}
return result;
}
@@ -839,7 +846,7 @@
if (!dp) return EGL_FALSE;
ContextRef _c(dp.get(), ctx);
- if (!_c.get()) return setError(EGL_BAD_CONTEXT, EGL_FALSE);
+ if (!_c.get()) return setError(EGL_BAD_CONTEXT, (EGLBoolean)EGL_FALSE);
egl_context_t * const c = get_context(ctx);
return c->cnx->egl.eglQueryContext(
@@ -900,7 +907,7 @@
egl_connection_t* const cnx = &gEGLImpl;
if (!cnx->dso)
- return setError(EGL_BAD_CONTEXT, EGL_FALSE);
+ return setError(EGL_BAD_CONTEXT, (EGLBoolean)EGL_FALSE);
return cnx->egl.eglWaitGL();
}
@@ -911,7 +918,7 @@
egl_connection_t* const cnx = &gEGLImpl;
if (!cnx->dso)
- return setError(EGL_BAD_CONTEXT, EGL_FALSE);
+ return setError(EGL_BAD_CONTEXT, (EGLBoolean)EGL_FALSE);
return cnx->egl.eglWaitNative(engine);
}
@@ -1039,7 +1046,7 @@
thread->mQueue.push_back(sync);
thread->mCondition.signal();
thread->mFramesQueued++;
- ATRACE_INT("GPU Frames Outstanding", thread->mQueue.size());
+ ATRACE_INT("GPU Frames Outstanding", int32_t(thread->mQueue.size()));
}
}
@@ -1073,7 +1080,7 @@
Mutex::Autolock lock(mMutex);
mQueue.removeAt(0);
mFramesCompleted++;
- ATRACE_INT("GPU Frames Outstanding", mQueue.size());
+ ATRACE_INT("GPU Frames Outstanding", int32_t(mQueue.size()));
}
return true;
}
@@ -1096,7 +1103,7 @@
SurfaceRef _s(dp.get(), draw);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t const * const s = get_surface(draw);
@@ -1161,7 +1168,7 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t const * const s = get_surface(surface);
return s->cnx->egl.eglCopyBuffers(dp->disp.dpy, s->surface, target);
@@ -1179,7 +1186,7 @@
// If we want to support EGL_EXT_client_extensions later, we can return
// the client extension string here instead.
if (dpy == EGL_NO_DISPLAY && name == EGL_EXTENSIONS)
- return setErrorQuiet(EGL_BAD_DISPLAY, nullptr);
+ return setErrorQuiet(EGL_BAD_DISPLAY, (const char*)0);
const egl_display_ptr dp = validate_display(dpy);
if (!dp) return (const char *) NULL;
@@ -1193,6 +1200,8 @@
return dp->getExtensionString();
case EGL_CLIENT_APIS:
return dp->getClientApiString();
+ default:
+ break;
}
return setError(EGL_BAD_PARAMETER, (const char *)0);
}
@@ -1213,6 +1222,8 @@
return dp->disp.queryString.extensions;
case EGL_CLIENT_APIS:
return dp->disp.queryString.clientApi;
+ default:
+ break;
}
return setError(EGL_BAD_PARAMETER, (const char *)0);
}
@@ -1231,7 +1242,7 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t * const s = get_surface(surface);
@@ -1239,27 +1250,23 @@
if (!s->win.get()) {
setError(EGL_BAD_SURFACE, EGL_FALSE);
}
- int err = native_window_set_auto_refresh(s->win.get(),
- value ? true : false);
- return (err == NO_ERROR) ? EGL_TRUE :
- setError(EGL_BAD_SURFACE, EGL_FALSE);
+ int err = native_window_set_auto_refresh(s->win.get(), value ? true : false);
+ return (err == NO_ERROR) ? EGL_TRUE : setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
if (attribute == EGL_TIMESTAMPS_ANDROID) {
if (!s->win.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
- int err = native_window_enable_frame_timestamps(
- s->win.get(), value ? true : false);
- return (err == NO_ERROR) ? EGL_TRUE :
- setError(EGL_BAD_SURFACE, EGL_FALSE);
+ int err = native_window_enable_frame_timestamps(s->win.get(), value ? true : false);
+ return (err == NO_ERROR) ? EGL_TRUE : setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
if (s->cnx->egl.eglSurfaceAttrib) {
return s->cnx->egl.eglSurfaceAttrib(
dp->disp.dpy, s->surface, attribute, value);
}
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
EGLBoolean eglBindTexImage(
@@ -1272,14 +1279,14 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t const * const s = get_surface(surface);
if (s->cnx->egl.eglBindTexImage) {
return s->cnx->egl.eglBindTexImage(
dp->disp.dpy, s->surface, buffer);
}
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
EGLBoolean eglReleaseTexImage(
@@ -1292,14 +1299,14 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t const * const s = get_surface(surface);
if (s->cnx->egl.eglReleaseTexImage) {
return s->cnx->egl.eglReleaseTexImage(
dp->disp.dpy, s->surface, buffer);
}
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
EGLBoolean eglSwapInterval(EGLDisplay dpy, EGLint interval)
@@ -1329,7 +1336,7 @@
egl_connection_t* const cnx = &gEGLImpl;
if (!cnx->dso)
- return setError(EGL_BAD_CONTEXT, EGL_FALSE);
+ return setError(EGL_BAD_CONTEXT, (EGLBoolean)EGL_FALSE);
EGLBoolean res;
if (cnx->egl.eglWaitClient) {
@@ -1345,7 +1352,7 @@
clearError();
if (egl_init_drivers() == EGL_FALSE) {
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+ return setError(EGL_BAD_PARAMETER, (EGLBoolean)EGL_FALSE);
}
// bind this API on all EGLs
@@ -1362,7 +1369,7 @@
clearError();
if (egl_init_drivers() == EGL_FALSE) {
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+ return setError(EGL_BAD_PARAMETER, (EGLBoolean)EGL_FALSE);
}
egl_connection_t* const cnx = &gEGLImpl;
@@ -1420,14 +1427,14 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t const * const s = get_surface(surface);
if (s->cnx->egl.eglLockSurfaceKHR) {
return s->cnx->egl.eglLockSurfaceKHR(
dp->disp.dpy, s->surface, attrib_list);
}
- return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
}
EGLBoolean eglUnlockSurfaceKHR(EGLDisplay dpy, EGLSurface surface)
@@ -1439,13 +1446,13 @@
SurfaceRef _s(dp.get(), surface);
if (!_s.get())
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
egl_surface_t const * const s = get_surface(surface);
if (s->cnx->egl.eglUnlockSurfaceKHR) {
return s->cnx->egl.eglUnlockSurfaceKHR(dp->disp.dpy, s->surface);
}
- return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
}
EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target,
@@ -1543,7 +1550,7 @@
const egl_display_ptr dp = validate_display(dpy);
if (!dp) return EGL_FALSE;
- EGLBoolean result = EGL_FALSE;
+ EGLint result = EGL_FALSE;
egl_connection_t* const cnx = &gEGLImpl;
if (cnx->dso && cnx->egl.eglClientWaitSyncKHR) {
result = cnx->egl.eglClientWaitSyncKHR(
@@ -2000,7 +2007,7 @@
clearError();
if (egl_init_drivers() == EGL_FALSE) {
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+ return setError(EGL_BAD_PARAMETER, (EGLuint64NV)EGL_FALSE);
}
EGLuint64NV ret = 0;
@@ -2010,7 +2017,7 @@
return cnx->egl.eglGetSystemTimeFrequencyNV();
}
- return setErrorQuiet(EGL_BAD_DISPLAY, 0);
+ return setErrorQuiet(EGL_BAD_DISPLAY, (EGLuint64NV)0);
}
EGLuint64NV eglGetSystemTimeNV()
@@ -2018,7 +2025,7 @@
clearError();
if (egl_init_drivers() == EGL_FALSE) {
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+ return setError(EGL_BAD_PARAMETER, (EGLuint64NV)EGL_FALSE);
}
EGLuint64NV ret = 0;
@@ -2028,7 +2035,7 @@
return cnx->egl.eglGetSystemTimeNV();
}
- return setErrorQuiet(EGL_BAD_DISPLAY, 0);
+ return setErrorQuiet(EGL_BAD_DISPLAY, (EGLuint64NV)0);
}
// ----------------------------------------------------------------------------
@@ -2066,18 +2073,18 @@
const egl_display_ptr dp = validate_display(dpy);
if (!dp) {
- return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
}
SurfaceRef _s(dp.get(), surface);
if (!_s.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
egl_surface_t const * const s = get_surface(surface);
if (!s->win.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
uint64_t nextFrameId = 0;
@@ -2087,7 +2094,7 @@
// This should not happen. Return an error that is not in the spec
// so it's obvious something is very wrong.
ALOGE("eglGetNextFrameId: Unexpected error.");
- return setError(EGL_NOT_INITIALIZED, EGL_FALSE);
+ return setError(EGL_NOT_INITIALIZED, (EGLBoolean)EGL_FALSE);
}
*frameId = nextFrameId;
@@ -2101,18 +2108,18 @@
const egl_display_ptr dp = validate_display(dpy);
if (!dp) {
- return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
}
SurfaceRef _s(dp.get(), surface);
if (!_s.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
egl_surface_t const * const s = get_surface(surface);
if (!s->win.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
nsecs_t* compositeDeadline = nullptr;
@@ -2131,7 +2138,7 @@
compositeToPresentLatency = &values[i];
break;
default:
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+ return setError(EGL_BAD_PARAMETER, (EGLBoolean)EGL_FALSE);
}
}
@@ -2142,12 +2149,12 @@
case NO_ERROR:
return EGL_TRUE;
case INVALID_OPERATION:
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
default:
// This should not happen. Return an error that is not in the spec
// so it's obvious something is very wrong.
ALOGE("eglGetCompositorTiming: Unexpected error.");
- return setError(EGL_NOT_INITIALIZED, EGL_FALSE);
+ return setError(EGL_NOT_INITIALIZED, (EGLBoolean)EGL_FALSE);
}
}
@@ -2158,19 +2165,19 @@
const egl_display_ptr dp = validate_display(dpy);
if (!dp) {
- return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
}
SurfaceRef _s(dp.get(), surface);
if (!_s.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
egl_surface_t const * const s = get_surface(surface);
ANativeWindow* window = s->win.get();
if (!window) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
switch (name) {
@@ -2191,18 +2198,18 @@
const egl_display_ptr dp = validate_display(dpy);
if (!dp) {
- return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
}
SurfaceRef _s(dp.get(), surface);
if (!_s.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
egl_surface_t const * const s = get_surface(surface);
if (!s->win.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
nsecs_t* requestedPresentTime = nullptr;
@@ -2249,7 +2256,7 @@
releaseTime = &values[i];
break;
default:
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
+ return setError(EGL_BAD_PARAMETER, (EGLBoolean)EGL_FALSE);
}
}
@@ -2259,19 +2266,19 @@
displayRetireTime, dequeueReadyTime, releaseTime);
switch (ret) {
- case NO_ERROR:
- return EGL_TRUE;
- case NAME_NOT_FOUND:
- return setError(EGL_BAD_ACCESS, EGL_FALSE);
- case INVALID_OPERATION:
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
- case BAD_VALUE:
- return setError(EGL_BAD_PARAMETER, EGL_FALSE);
- default:
- // This should not happen. Return an error that is not in the spec
- // so it's obvious something is very wrong.
- ALOGE("eglGetFrameTimestamps: Unexpected error.");
- return setError(EGL_NOT_INITIALIZED, EGL_FALSE);
+ case NO_ERROR:
+ return EGL_TRUE;
+ case NAME_NOT_FOUND:
+ return setError(EGL_BAD_ACCESS, (EGLBoolean)EGL_FALSE);
+ case INVALID_OPERATION:
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
+ case BAD_VALUE:
+ return setError(EGL_BAD_PARAMETER, (EGLBoolean)EGL_FALSE);
+ default:
+ // This should not happen. Return an error that is not in the spec
+ // so it's obvious something is very wrong.
+ ALOGE("eglGetFrameTimestamps: Unexpected error.");
+ return setError(EGL_NOT_INITIALIZED, (EGLBoolean)EGL_FALSE);
}
}
@@ -2282,19 +2289,19 @@
const egl_display_ptr dp = validate_display(dpy);
if (!dp) {
- return setError(EGL_BAD_DISPLAY, EGL_FALSE);
+ return setError(EGL_BAD_DISPLAY, (EGLBoolean)EGL_FALSE);
}
SurfaceRef _s(dp.get(), surface);
if (!_s.get()) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
egl_surface_t const * const s = get_surface(surface);
ANativeWindow* window = s->win.get();
if (!window) {
- return setError(EGL_BAD_SURFACE, EGL_FALSE);
+ return setError(EGL_BAD_SURFACE, (EGLBoolean)EGL_FALSE);
}
switch (timestamp) {
@@ -2312,14 +2319,12 @@
return EGL_TRUE;
case EGL_DISPLAY_PRESENT_TIME_ANDROID: {
int value = 0;
- window->query(window,
- NATIVE_WINDOW_FRAME_TIMESTAMPS_SUPPORTS_PRESENT, &value);
+ window->query(window, NATIVE_WINDOW_FRAME_TIMESTAMPS_SUPPORTS_PRESENT, &value);
return value == 0 ? EGL_FALSE : EGL_TRUE;
}
case EGL_DISPLAY_RETIRE_TIME_ANDROID: {
int value = 0;
- window->query(window,
- NATIVE_WINDOW_FRAME_TIMESTAMPS_SUPPORTS_RETIRE, &value);
+ window->query(window, NATIVE_WINDOW_FRAME_TIMESTAMPS_SUPPORTS_RETIRE, &value);
return value == 0 ? EGL_FALSE : EGL_TRUE;
}
default: