Don't compile D3D geometry shader when using instanced point emulation

If ANGLE is using instanced point sprites (e.g. on Feature Level 9_3) then it still tries to compile the point sprite geometry shader. It shouldn't do this. Change-Id: I6e7753dd337c385893fc4bea6c8438aeaf5e8427 Reviewed-on: https://chromium-review.googlesource.com/321397 Tryjob-Request: Austin Kinross <aukinros@microsoft.com> Tested-by: Austin Kinross <aukinros@microsoft.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Don't compile D3D geometry shader when using instanced point emulation
88829e84 · Austin Kinross · Jamie Madill · a433388d · 88829e84
Commit 88829e84 authored Jan 12, 2016 by Austin Kinross Committed by Jamie Madill Jan 19, 2016
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

ProgramD3D.cpp src/libANGLE/renderer/d3d/ProgramD3D.cpp +2 -3

No files found.
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -1242,9 +1242,8 @@ gl::Error ProgramD3D::getGeometryExecutableForPrimitiveType(const gl::Data &data
        *outExecutable = nullptr;
    }
-    // We only uses a geometry shader for point sprite emulation, or for fixing the provoking
+    // Return a null shader if the current rendering doesn't use a geometry shader
-    // vertex problem. Otherwise, return a null shader.
+    if (!usesGeometryShader(drawMode))
-    if (drawMode != GL_POINTS && !mUsesFlatInterpolation)
    {
        return gl::Error(GL_NO_ERROR);
    }