Move blitter creation / destruction to device specific initialization / release.

TRAC #22016 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1489 736b8ea6-26fd-11df-bfd4-992fa37f6226

Move blitter creation / destruction to device specific initialization / release.
e569fc52 · daniel@transgaming.com · 5367004c · e569fc52
Commit e569fc52 authored Nov 28, 2012 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

Renderer9.cpp src/libGLESv2/renderer/Renderer9.cpp +6 -8

No files found.
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -95,8 +95,6 @@ Renderer9::Renderer9(egl::Display *display, HDC hDc, bool softwareDevice) : Rend
 Renderer9::~Renderer9()
 {
    releaseDeviceResources();
-    
-    delete mBlit;

    if (mDevice)
    {
@@ -375,8 +373,6 @@ EGLint Renderer9::initialize()

    initializeDevice();

-    mBlit = new Blit(this);
-
    return EGL_SUCCESS;
 }

@@ -402,10 +398,9 @@ void Renderer9::initializeDevice()

    mSceneStarted = false;

-    if (!mVertexDataManager)
-    {
-        mVertexDataManager = new gl::VertexDataManager(this);
-    }
+    ASSERT(!mBlit && !mVertexDataManager);
+    mBlit = new Blit(this);
+    mVertexDataManager = new gl::VertexDataManager(this);
 }

 D3DPRESENT_PARAMETERS Renderer9::getDefaultPresentParameters()
@@ -1339,6 +1334,9 @@ void Renderer9::releaseDeviceResources()
    mVertexShaderCache.clear();
    mPixelShaderCache.clear();

+    delete mBlit;
+    mBlit = NULL;
+
    delete mVertexDataManager;
    mVertexDataManager = NULL;
 }