commit bbdeeb186be7fef6c773a2c897de1446cb2c024f
author Jamie Madill <jmadill@chromium.org> Thu Nov 12 15:42:16 2015 +0000
committer Jamie Madill <jmadill@chromium.org> Thu Nov 12 15:42:34 2015 +0000
tree 57aba091d24b8f0c189df20ac50ef46c41b65443
parent d992cde27ea6ffd71205399c3ddb88c7085c99b4

Revert "D3D: Move some varying packing code into a new file."

Compile error:

c:\b\build\slave\gpu_win_builder\build\src\third_party\angle\src\libangle\renderer\d3d\dynamichlsl.cpp(508) : error C3861: 'getSemanticInfo': identifier not found
c:\b\build\slave\gpu_win_builder\build\src\third_party\angle\src\libangle\renderer\d3d\dynamichlsl.cpp(642) : error C3861: 'getSemanticInfo': identifier not found

BUG=angleproject:1202

This reverts commit d992cde27ea6ffd71205399c3ddb88c7085c99b4.

Change-Id: I11f34d2ac4cc047c397e45348cb9502676380be0
Reviewed-on: https://chromium-review.googlesource.com/312480
Reviewed-by: Jamie Madill <jmadill@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 21eb6b5..9268bff 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -20,7 +20,6 @@
 #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
@@ -1262,8 +1261,8 @@
 
     // Map the varyings to the register file
     unsigned int registerCount = 0;
-    if (!PackVaryings(*data.caps, infoLog, &packedVaryings,
-                      mData.getTransformFeedbackVaryingNames(), &registerCount))
+    if (!mDynamicHLSL->packVaryings(*data.caps, infoLog, &packedVaryings,
+                                    mData.getTransformFeedbackVaryingNames(), &registerCount))
     {
         return LinkResult(false, gl::Error(GL_NO_ERROR));
     }