commit 76f8fa663123a3d569e2d1872b59d145ad19f4b5
author Jamie Madill <jmadill@chromium.org> Thu Oct 29 10:32:56 2015 -0400
committer Jamie Madill <jmadill@chromium.org> Fri Oct 30 15:43:06 2015 +0000
tree dc16ddc98cd0c413d479e5391e89a84a5f98121d
parent 1cc109039c4b88e4d159c4c79b089da9efe3777d

Refactor Geometry Shader support to enable pass-through.

This should be a refactoring change only. The new code is exercised in
follow-up CLs.

BUG=angleproject:754

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

src/libANGLE/renderer/d3d/ProgramD3D.cpp

diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index 87649d1..9995d49 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -1039,8 +1039,6 @@
                                                  int registers,
                                                  const std::vector<PackedVarying> &packedVaryings)
 {
-    const ShaderD3D *fragmentShaderD3D = GetImplAs<ShaderD3D>(mData.getAttachedFragmentShader());
-
     const gl::InputLayout &defaultInputLayout =
         GetDefaultInputLayoutFromShader(mData.getAttachedVertexShader());
     ShaderExecutableD3D *defaultVertexExecutable = NULL;
@@ -1063,7 +1061,7 @@
     if (usesGeometryShader())
     {
         std::string geometryHLSL = mDynamicHLSL->generateGeometryShaderHLSL(
-            data, registers, fragmentShaderD3D, packedVaryings);
+            gl::PRIMITIVE_POINTS, data, mData, registers, packedVaryings);
 
         error = mRenderer->compileToExecutable(
             infoLog, geometryHLSL, SHADER_GEOMETRY, mTransformFeedbackLinkedVaryings,
@@ -1077,7 +1075,6 @@
 
 #if ANGLE_SHADER_DEBUG_INFO == ANGLE_ENABLED
     const ShaderD3D *vertexShaderD3D = GetImplAs<ShaderD3D>(mData.getAttachedVertexShader());
-
     if (usesGeometryShader() && mGeometryExecutable)
     {
         // Geometry shaders are currently only used internally, so there is no corresponding shader
@@ -1095,6 +1092,8 @@
 
     if (defaultPixelExecutable)
     {
+        const ShaderD3D *fragmentShaderD3D =
+            GetImplAs<ShaderD3D>(mData.getAttachedFragmentShader());
         fragmentShaderD3D->appendDebugInfo(defaultPixelExecutable->getDebugInfo());
     }
 #endif