Issue 199: invalid assertion in Surface.cpp makes debug browser crash on…

Issue 199: invalid assertion in Surface.cpp makes debug browser crash on conformance test drawingbuffer-static-canvas-test.html This patch fixes assertions that were wrongly asserting that only OOM errors could occur when allocating a D3D texture/surface. The drawingbuffer-static-canvas-test.html test tries a 32768x150 size, and that fails because of the too large width without being OOM. git-svn-id: https://angleproject.googlecode.com/svn/trunk@739 736b8ea6-26fd-11df-bfd4-992fa37f6226

Issue 199: invalid assertion in Surface.cpp makes debug browser crash on…
bde15998 · jacob.benoit.1@gmail.com · 32e97315 · bde15998 · bde15998
Commit bde15998 authored Aug 24, 2011 by jacob.benoit.1@gmail.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

version.h src/common/version.h +1 -1

Surface.cpp src/libEGL/Surface.cpp +2 -2

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #define MAJOR_VERSION 0
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 738
+#define BUILD_REVISION 739

 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

--- a/src/libEGL/Surface.cpp
+++ b/src/libEGL/Surface.cpp
@@ -232,7 +232,7 @@ bool Surface::resetSwapChain(int backbufferWidth, int backbufferHeight)

    if (FAILED(result))
    {
-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
+        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY || result == D3DERR_INVALIDCALL);

        ERR("Could not create additional swap chains or offscreen surfaces: %08lX", result);
        release();
@@ -248,7 +248,7 @@ bool Surface::resetSwapChain(int backbufferWidth, int backbufferHeight)

    if (FAILED(result))
    {
-        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY);
+        ASSERT(result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY || result == D3DERR_INVALIDCALL);

        ERR("Could not create depthstencil surface for new swap chain: %08lX", result);
        release();