commit dad5ed3953e4f31c35b9fd67901fb78dbe140dd0
author Geoff Lang <geofflang@chromium.org> Mon Feb 10 12:59:17 2014 -0500
committer Geoff Lang <geofflang@chromium.org> Tue Feb 18 16:44:54 2014 +0000
tree e419396e64a59cb1d7198832a26660ec97371d7d
parent 8664b063b533bab059fdd650a8327a0cede50db1

Refactor HLSL compilation out of Renderer.

This moves the start-up and tear-down code for D3DCompiler.dll into an object
that Renderer9 and Renderer11 use.  This will help future efforts to remove
references to HLSL at the GL/Renderer interface level.

BUG=angle:558

Change-Id: I18fcf9b237265d69c1d7d2ea345696c8fd31df29
Reviewed-on: https://chromium-review.googlesource.com/185568
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/renderer/d3d11/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/d3d11/Renderer11.cpp b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
index 31d31c4..f9c84dd 100644
--- a/src/libGLESv2/renderer/d3d11/Renderer11.cpp
+++ b/src/libGLESv2/renderer/d3d11/Renderer11.cpp
@@ -113,7 +113,7 @@
 
 EGLint Renderer11::initialize()
 {
-    if (!initializeCompiler())
+    if (!mCompiler.initialize())
     {
         return EGL_NOT_INITIALIZED;
     }
@@ -1800,6 +1800,8 @@
         FreeLibrary(mDxgiModule);
         mDxgiModule = NULL;
     }
+
+    mCompiler.release();
 }
 
 bool Renderer11::resetDevice()
@@ -2837,7 +2839,7 @@
         return NULL;
     }
 
-    ID3DBlob *binary = (ID3DBlob*)compileToBinary(infoLog, shaderHLSL, profile, D3DCOMPILE_OPTIMIZATION_LEVEL0, false);
+    ID3DBlob *binary = (ID3DBlob*)mCompiler.compileToBinary(infoLog, shaderHLSL, profile, D3DCOMPILE_OPTIMIZATION_LEVEL0, false);
     if (!binary)
     {
         return NULL;