Commit 8fc5740b by Jamie Madill

Fix D3DCompile time histogram.

The order of the scoped histogram init got clobbered from a bad merge. BUG=516027 Change-Id: Id5319c5a3a586b21fb64c0f161aebcfb3366722a Reviewed-on: https://chromium-review.googlesource.com/290860Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent cb32524e
...@@ -201,10 +201,10 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string ...@@ -201,10 +201,10 @@ gl::Error HLSLCompiler::compileToBinary(gl::InfoLog &infoLog, const std::string
HRESULT result = S_OK; HRESULT result = S_OK;
{ {
SCOPED_ANGLE_HISTOGRAM_TIMER("GPU.ANGLE.D3DCompileMS");
result = mD3DCompileFunc(hlsl.c_str(), hlsl.length(), gl::g_fakepath, macros, NULL, result = mD3DCompileFunc(hlsl.c_str(), hlsl.length(), gl::g_fakepath, macros, NULL,
"main", profile.c_str(), configs[i].flags, 0, &binary, "main", profile.c_str(), configs[i].flags, 0, &binary,
&errorMessage); &errorMessage);
SCOPED_ANGLE_HISTOGRAM_TIMER("GPU.ANGLE.D3DCompileMS");
} }
if (errorMessage) if (errorMessage)
......
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