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
parent 5367004c
...@@ -95,8 +95,6 @@ Renderer9::Renderer9(egl::Display *display, HDC hDc, bool softwareDevice) : Rend ...@@ -95,8 +95,6 @@ Renderer9::Renderer9(egl::Display *display, HDC hDc, bool softwareDevice) : Rend
Renderer9::~Renderer9() Renderer9::~Renderer9()
{ {
releaseDeviceResources(); releaseDeviceResources();
delete mBlit;
if (mDevice) if (mDevice)
{ {
...@@ -375,8 +373,6 @@ EGLint Renderer9::initialize() ...@@ -375,8 +373,6 @@ EGLint Renderer9::initialize()
initializeDevice(); initializeDevice();
mBlit = new Blit(this);
return EGL_SUCCESS; return EGL_SUCCESS;
} }
...@@ -402,10 +398,9 @@ void Renderer9::initializeDevice() ...@@ -402,10 +398,9 @@ void Renderer9::initializeDevice()
mSceneStarted = false; mSceneStarted = false;
if (!mVertexDataManager) ASSERT(!mBlit && !mVertexDataManager);
{ mBlit = new Blit(this);
mVertexDataManager = new gl::VertexDataManager(this); mVertexDataManager = new gl::VertexDataManager(this);
}
} }
D3DPRESENT_PARAMETERS Renderer9::getDefaultPresentParameters() D3DPRESENT_PARAMETERS Renderer9::getDefaultPresentParameters()
...@@ -1339,6 +1334,9 @@ void Renderer9::releaseDeviceResources() ...@@ -1339,6 +1334,9 @@ void Renderer9::releaseDeviceResources()
mVertexShaderCache.clear(); mVertexShaderCache.clear();
mPixelShaderCache.clear(); mPixelShaderCache.clear();
delete mBlit;
mBlit = NULL;
delete mVertexDataManager; delete mVertexDataManager;
mVertexDataManager = NULL; mVertexDataManager = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment