commit d9cccfd5eba7be78520e0ca5ca66cd3dec2c8aca
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Mon Dec 12 21:01:35 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Mon Dec 12 21:01:35 2011 +0000
tree 3caadb372a658938a26a13b4338e624eb793330f
parent 9dd7ead0857960829acfc127b48cefdb17823477

Fix error reporting for lost contexts

Trac #19246
Issue=262

Signed-off-by: Nicolas Capens

git-svn-id: http://angleproject.googlecode.com/svn/trunk@906 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/common/version.h

diff --git a/src/common/version.h b/src/common/version.h
index a38bea9..7882c2a 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 905
+#define BUILD_REVISION 906
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/libGLESv2.cpp

diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index bad6f41..30055bb 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -2707,10 +2707,7 @@
 
     if (context)
     {
-        if (context->isContextLost())
-            return GL_OUT_OF_MEMORY;
-        else
-            return context->getError();
+        return context->getError();
     }
 
     return GL_NO_ERROR;

src/libGLESv2/main.cpp

diff --git a/src/libGLESv2/main.cpp b/src/libGLESv2/main.cpp
index affab7a..154d277 100644
--- a/src/libGLESv2/main.cpp
+++ b/src/libGLESv2/main.cpp
@@ -98,9 +98,18 @@
 {
     Context *context = getContext();
     
-    if (context && !context->isContextLost())
-        return context;
-
+    if (context)
+    {
+        if (context->isContextLost())
+        {
+            error(GL_OUT_OF_MEMORY);
+            return NULL;
+        }
+        else
+        {
+            return context;
+        }
+    }
     return NULL;
 }