commit 65345da4ade8deb7dee3628e46b491aeed4d6585
author Jamie Madill <jmadill@chromium.org> Fri Nov 13 11:25:23 2015 -0500
committer Jamie Madill <jmadill@chromium.org> Fri Nov 13 18:29:57 2015 +0000
tree a9beb6d9fd22c793b4c3622ad281cf551cabd575
parent 67bc10212d4079817f596478226112f8d2fd899d

Re-land "D3D: Move some varying packing code into a new file."

Re-land with fix for compile errors.

Refactoring patch which moves code only. Work and full description
will follow in a subsequent CL.

BUG=angleproject:1202

Change-Id: Ib7c7dbd32491cdd9512dbecdc0e1e90303d8f28d
Reviewed-on: https://chromium-review.googlesource.com/312481
Tryjob-Request: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@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 9268bff..21eb6b5 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -20,6 +20,7 @@
 #include "libANGLE/renderer/d3d/RendererD3D.h"
 #include "libANGLE/renderer/d3d/ShaderD3D.h"
 #include "libANGLE/renderer/d3d/ShaderExecutableD3D.h"
+#include "libANGLE/renderer/d3d/VaryingPacking.h"
 #include "libANGLE/renderer/d3d/VertexDataManager.h"
 
 namespace rx
@@ -1261,8 +1262,8 @@
 
     // Map the varyings to the register file
     unsigned int registerCount = 0;
-    if (!mDynamicHLSL->packVaryings(*data.caps, infoLog, &packedVaryings,
-                                    mData.getTransformFeedbackVaryingNames(), &registerCount))
+    if (!PackVaryings(*data.caps, infoLog, &packedVaryings,
+                      mData.getTransformFeedbackVaryingNames(), &registerCount))
     {
         return LinkResult(false, gl::Error(GL_NO_ERROR));
     }