Implemented Renderer11::compileToExecutable.
TRAC #22191
Signed-off-by: Shannon Woods
Signed-off-by: Daniel Koch
Author: Nicolas Capens
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1529 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/Renderer9.cpp b/src/libGLESv2/renderer/Renderer9.cpp
index 71bc1e7..418ceb5 100644
--- a/src/libGLESv2/renderer/Renderer9.cpp
+++ b/src/libGLESv2/renderer/Renderer9.cpp
@@ -2698,7 +2698,7 @@
}
gl::D3DConstantTable *constantTable = NULL;
- ID3D10Blob *binary = compileToBinary(infoLog, shaderHLSL, profile, &constantTable);
+ ID3DBlob *binary = compileToBinary(infoLog, shaderHLSL, profile, &constantTable);
if (!binary)
return NULL;
@@ -2709,7 +2709,7 @@
}
// Compiles the HLSL code of the attached shaders into executable binaries
-ID3D10Blob *Renderer9::compileToBinary(gl::InfoLog &infoLog, const char *hlsl, const char *profile, gl::D3DConstantTable **constantTable)
+ID3DBlob *Renderer9::compileToBinary(gl::InfoLog &infoLog, const char *hlsl, const char *profile, gl::D3DConstantTable **constantTable)
{
if (!hlsl)
{
@@ -2756,8 +2756,8 @@
for (int i = 0; i < sizeof(extraFlags) / sizeof(UINT); ++i)
{
- ID3D10Blob *errorMessage = NULL;
- ID3D10Blob *binary = NULL;
+ ID3DBlob *errorMessage = NULL;
+ ID3DBlob *binary = NULL;
result = mD3DCompileFunc(hlsl, strlen(hlsl), gl::g_fakepath, NULL, NULL,
"main", profile, flags | extraFlags[i], 0, &binary, &errorMessage);
if (errorMessage)
@@ -2789,7 +2789,7 @@
{
if (result == D3DERR_OUTOFVIDEOMEMORY || result == E_OUTOFMEMORY)
{
- return error(GL_OUT_OF_MEMORY, (ID3D10Blob*) NULL);
+ return error(GL_OUT_OF_MEMORY, (ID3DBlob*) NULL);
}
infoLog.append("Warning: D3D shader compilation failed with ");