Fixed Display::initialize so it does not crash for devices that do not support PS 2.0.

The crash occurs when createDevice attempts to dereference mD3d9, which is NULL. Review URL: http://codereview.appspot.com/1956042 git-svn-id: https://angleproject.googlecode.com/svn/trunk@382 736b8ea6-26fd-11df-bfd4-992fa37f6226

Fixed Display::initialize so it does not crash for devices that do not support PS 2.0.
6ad6ce8d · apatrick@chromium.org · c7b6eba9 · 6ad6ce8d
Commit 6ad6ce8d authored Aug 12, 2010 by apatrick@chromium.org
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

Display.cpp src/libEGL/Display.cpp +3 -5

No files found.
--- a/src/libEGL/Display.cpp
+++ b/src/libEGL/Display.cpp
@@ -70,11 +70,10 @@ bool Display::initialize()

        if (mDeviceCaps.PixelShaderVersion < D3DPS_VERSION(2, 0))
        {
-            mD3d9->Release();
-            mD3d9 = NULL;
+            terminate();
+            return error(EGL_NOT_INITIALIZED, false);
        }
-        else
-        {
+
        mMinSwapInterval = 4;
        mMaxSwapInterval = 0;

@@ -150,7 +149,6 @@ bool Display::initialize()

            mConfigSet.mSet.insert(configuration);
        }
-        }

        if (!createDevice())
        {