summaryrefslogtreecommitdiff
path: root/opengl
diff options
context:
space:
mode:
author Courtney Goeltzenleuchter <courtneygo@google.com> 2018-02-01 19:09:41 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-02-01 19:09:41 +0000
commit0d3890a91fcc9e3c7c37c252294a6480c2638d30 (patch)
tree7be726144f2bf27ca169000f17ece383097b6d5c /opengl
parent644d9438a69b260024627d9ea44ffda452912bee (diff)
parent52de2fdaf23e17ca73cf1dd09ee5ebd31245966b (diff)
Merge "EGL: Properly strip out unknown attributes"
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libs/EGL/eglApi.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 484e0baffc..26ae13da25 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -513,11 +513,11 @@ static EGLBoolean stripAttributes(egl_display_ptr dp, const EGLint* attrib_list,
found = true;
}
}
- if (found && dp->haveExtension("EGL_KHR_gl_colorspace")) {
- stripped = true;
- } else {
+ if (found || !dp->haveExtension("EGL_KHR_gl_colorspace")) {
stripped_attrib_list.push_back(attr[0]);
stripped_attrib_list.push_back(attr[1]);
+ } else {
+ stripped = true;
}
}
break;