Move the D3DCompile call to after the check for API link errors.

This avoids producing unhelpful internal D3D errors. TRAC #23326 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Authored-by: Jamie Madill

Move the D3DCompile call to after the check for API link errors.
d1ac3c90 · Jamie Madill · Shannon Woods · fb50dff0 · d1ac3c90
Commit d1ac3c90 authored Jun 25, 2013 by Jamie Madill Committed by Shannon Woods Jul 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 21 deletions

ProgramBinary.cpp src/libGLESv2/ProgramBinary.cpp +25 -21

No files found.
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -2004,27 +2004,6 @@ bool ProgramBinary::link(InfoLog &infoLog, const AttributeBindings &attributeBin
    }

    bool success = true;
-    mVertexExecutable = mRenderer->compileToExecutable(infoLog, vertexHLSL.c_str(), rx::SHADER_VERTEX);
-    mPixelExecutable = mRenderer->compileToExecutable(infoLog, pixelHLSL.c_str(), rx::SHADER_PIXEL);
-
-    if (usesGeometryShader())
-    {
-        std::string geometryHLSL = generateGeometryShaderHLSL(registers, packing, fragmentShader, vertexShader);
-        mGeometryExecutable = mRenderer->compileToExecutable(infoLog, geometryHLSL.c_str(), rx::SHADER_GEOMETRY);
-    }
-
-    if (!mVertexExecutable || !mPixelExecutable || (usesGeometryShader() && !mGeometryExecutable))
-    {
-        infoLog.append("Failed to create D3D shaders.");
-        success = false;
-
-        delete mVertexExecutable;
-        mVertexExecutable = NULL;
-        delete mPixelExecutable;
-        mPixelExecutable = NULL;
-        delete mGeometryExecutable;
-        mGeometryExecutable = NULL;
-    }

    if (!linkAttributes(infoLog, attributeBindings, fragmentShader, vertexShader))
    {
@@ -2049,6 +2028,31 @@ bool ProgramBinary::link(InfoLog &infoLog, const AttributeBindings &attributeBin
        success = false;
    }

+    if (success)
+    {
+        mVertexExecutable = mRenderer->compileToExecutable(infoLog, vertexHLSL.c_str(), rx::SHADER_VERTEX);
+        mPixelExecutable = mRenderer->compileToExecutable(infoLog, pixelHLSL.c_str(), rx::SHADER_PIXEL);
+
+        if (usesGeometryShader())
+        {
+            std::string geometryHLSL = generateGeometryShaderHLSL(registers, packing, fragmentShader, vertexShader);
+            mGeometryExecutable = mRenderer->compileToExecutable(infoLog, geometryHLSL.c_str(), rx::SHADER_GEOMETRY);
+        }
+
+        if (!mVertexExecutable || !mPixelExecutable || (usesGeometryShader() && !mGeometryExecutable))
+        {
+            infoLog.append("Failed to create D3D shaders.");
+            success = false;
+
+            delete mVertexExecutable;
+            mVertexExecutable = NULL;
+            delete mPixelExecutable;
+            mPixelExecutable = NULL;
+            delete mGeometryExecutable;
+            mGeometryExecutable = NULL;
+        }
+    }
+
    return success;
 }