Commit 6d85f039 by Austin Kinross Committed by Jamie Madill

Fix WinRT compilation issue in ShaderD3D.cpp

Change-Id: If7bd4e9cdba3d893f2ee28a70b894af3fb37ae30 Reviewed-on: https://chromium-review.googlesource.com/304488Tested-by: 's avatarAustin Kinross <aukinros@microsoft.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent f22c6b13
...@@ -123,9 +123,9 @@ int ShaderD3D::prepareSourceAndReturnOptions(std::stringstream *shaderSourceStre ...@@ -123,9 +123,9 @@ int ShaderD3D::prepareSourceAndReturnOptions(std::stringstream *shaderSourceStre
int additionalOptions = 0; int additionalOptions = 0;
#if !defined(ANGLE_ENABLE_WINDOWS_STORE)
const std::string &source = mData.getSource(); const std::string &source = mData.getSource();
#if !defined(ANGLE_ENABLE_WINDOWS_STORE)
if (gl::DebugAnnotationsActive()) if (gl::DebugAnnotationsActive())
{ {
std::string sourcePath = getTempPath(); std::string sourcePath = getTempPath();
...@@ -134,6 +134,7 @@ int ShaderD3D::prepareSourceAndReturnOptions(std::stringstream *shaderSourceStre ...@@ -134,6 +134,7 @@ int ShaderD3D::prepareSourceAndReturnOptions(std::stringstream *shaderSourceStre
*shaderSourceStream << sourcePath; *shaderSourceStream << sourcePath;
} }
#endif #endif
*shaderSourceStream << source; *shaderSourceStream << source;
return additionalOptions; return additionalOptions;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment