Avoid crash in createDevice() if it is called on a Display that did not…

Avoid crash in createDevice() if it is called on a Display that did not initialize (e.g. Direct3DCreate9 returned NULL). Fixed compiler warning. Landed on behalf of baustin: https://codereview.appspot.com/7794046/. Review URL: https://codereview.appspot.com/7494048 git-svn-id: https://angleproject.googlecode.com/svn/trunk@2000 736b8ea6-26fd-11df-bfd4-992fa37f6226

Avoid crash in createDevice() if it is called on a Display that did not…
d64134c3 · apatrick@chromium.org · 60ea6836 · d64134c3 · d64134c3
Commit d64134c3 authored Mar 19, 2013 by apatrick@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

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

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

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

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

--- a/src/libEGL/Display.cpp
+++ b/src/libEGL/Display.cpp
@@ -477,6 +477,10 @@ bool Display::getConfigAttrib(EGLConfig config, EGLint attribute, EGLint *value)

 bool Display::createDevice()
 {
+    if (!isInitialized())
+    {
+        return error(EGL_NOT_INITIALIZED, false);
+    }
    D3DPRESENT_PARAMETERS presentParameters = getDefaultPresentParameters();
    DWORD behaviorFlags = D3DCREATE_FPU_PRESERVE | D3DCREATE_NOWINDOWCHANGES;

@@ -1163,7 +1167,7 @@ float Display::getTextureFilterAnisotropySupport() const
    // Must support a minimum of 2:1 anisotropy for max anisotropy to be considered supported, per the spec
    if ((mDeviceCaps.RasterCaps & D3DPRASTERCAPS_ANISOTROPY) && (mDeviceCaps.MaxAnisotropy >= 2))
    {
-        return mDeviceCaps.MaxAnisotropy;
+        return static_cast<float>(mDeviceCaps.MaxAnisotropy);
    }
    return 1.0f;
 }