Skip to content

A
angle
Commit d9fe55fe by Corentin Wallez
Options

Fix compilation errors on Android

TBR=ynovikov@chromium.org BUG=None Change-Id: I3d90027eaa2479622d7ea80f5dc69d2578d5b1b3 Reviewed-on: https://chromium-review.googlesource.com/361548Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 78a9c733
Showing with 4 additions and 1 deletion
src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
...@@ -159,6 +159,7 @@ SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state, ...@@ -159,6 +159,7 @@ SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state,
EGL_NONE}; EGL_NONE};
success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig); success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig);
ASSERT(success && numConfig == 1); ASSERT(success && numConfig == 1);
UNUSED_ASSERTION_VARIABLE(success);
return new WindowSurfaceEGL(state, mEGL, config, window, attribs.toIntVector(), mContext, return new WindowSurfaceEGL(state, mEGL, config, window, attribs.toIntVector(), mContext,
getRenderer()); getRenderer());
...@@ -176,6 +177,7 @@ SurfaceImpl *DisplayAndroid::createPbufferSurface(const egl::SurfaceState &state ...@@ -176,6 +177,7 @@ SurfaceImpl *DisplayAndroid::createPbufferSurface(const egl::SurfaceState &state
EGL_NONE}; EGL_NONE};
success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig); success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig);
ASSERT(success && numConfig == 1); ASSERT(success && numConfig == 1);
UNUSED_ASSERTION_VARIABLE(success);
return new PbufferSurfaceEGL(state, mEGL, config, attribs.toIntVector(), mContext, return new PbufferSurfaceEGL(state, mEGL, config, attribs.toIntVector(), mContext,
getRenderer()); getRenderer());
...@@ -212,8 +214,8 @@ void DisplayAndroid::getConfigAttrib(EGLConfig config, EGLint attribute, T *valu ...@@ -212,8 +214,8 @@ void DisplayAndroid::getConfigAttrib(EGLConfig config, EGLint attribute, T *valu
{ {
EGLint tmp; EGLint tmp;
EGLBoolean success = mEGL->getConfigAttrib(config, attribute, &tmp); EGLBoolean success = mEGL->getConfigAttrib(config, attribute, &tmp);
UNUSED_ASSERTION_VARIABLE(success);
ASSERT(success == EGL_TRUE); ASSERT(success == EGL_TRUE);
UNUSED_ASSERTION_VARIABLE(success);
*value = tmp; *value = tmp;
} }
...@@ -231,6 +233,7 @@ egl::ConfigSet DisplayAndroid::generateConfigs() ...@@ -231,6 +233,7 @@ egl::ConfigSet DisplayAndroid::generateConfigs()
success = success =
mEGL->chooseConfig(mConfigAttribList.data(), configs.data(), numConfigs, &numConfigs2); mEGL->chooseConfig(mConfigAttribList.data(), configs.data(), numConfigs, &numConfigs2);
ASSERT(success == EGL_TRUE && numConfigs2 == numConfigs); ASSERT(success == EGL_TRUE && numConfigs2 == numConfigs);
UNUSED_ASSERTION_VARIABLE(success);
for (int i = 0; i < numConfigs; i++) for (int i = 0; i < numConfigs; i++)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment