commit 82b289138e7a818d343429d52023e3e2e560142e
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 7f4dee1452dffb2201a1355d5b1802e547fcb0b8

Fix error reporting for lost contexts

Trac #19246
Issue=262

Signed-off-by: Nicolas Capens

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

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;
 }