commit a2d76fb4a1967322c3a937c6e8f8f7168a66eda1
author Pascal Muetschard <pmuetschard@google.com> Wed Aug 19 20:47:10 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 19 20:47:10 2015 +0000
tree 5efccf2cc8debcf532c7abe51841287bd9b99ed2
parent 36430431d5a3a268ca413ae8c58bc96610477043
parent 6801005a9e9e5741cbc73a98d7282485767d7e96

Merge "Fixes interpretation of attribute lists in the EGL emulation library."

opengl/system/egl/egl.cpp

diff --git a/opengl/system/egl/egl.cpp b/opengl/system/egl/egl.cpp
index 86897d4..e9d59ab 100644
--- a/opengl/system/egl/egl.cpp
+++ b/opengl/system/egl/egl.cpp
@@ -659,7 +659,7 @@
     int32_t h = 0;
     EGLint texFormat = EGL_NO_TEXTURE;
     EGLint texTarget = EGL_NO_TEXTURE;
-    while (attrib_list[0]) {
+    while (attrib_list[0] != EGL_NONE) {
         switch (attrib_list[0]) {
             case EGL_WIDTH:
                 w = attrib_list[1];
@@ -883,7 +883,7 @@
     VALIDATE_CONFIG(config, EGL_NO_CONTEXT);
 
     EGLint version = 1; //default
-    while (attrib_list && attrib_list[0]) {
+    while (attrib_list && attrib_list[0] != EGL_NONE) {
         if (attrib_list[0] == EGL_CONTEXT_CLIENT_VERSION) version = attrib_list[1];
         attrib_list+=2;
     }
@@ -1001,7 +1001,7 @@
             hostCon->glEncoder()->setClientState(context->getClientState());
             hostCon->glEncoder()->setSharedGroup(context->getSharedGroup());
         }
-    } 
+    }
     else if (tInfo->currentContext) {
         //release ClientState & SharedGroup
         if (tInfo->currentContext->version == 2) {