diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
| commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
| tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp | |
| parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
| download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz | |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp')
| -rw-r--r-- | chromium/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp index e8b1af31291..305b6c4e4ac 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/HLSLCompiler.cpp @@ -136,7 +136,8 @@ gl::Error HLSLCompiler::initialize() if (!mD3DCompilerModule) { - return gl::Error(GL_INVALID_OPERATION, "No D3D compiler module found - aborting!\n"); + ERR("D3D compiler module not found."); + return gl::Error(GL_OUT_OF_MEMORY, "D3D compiler module not found."); } mD3DCompileFunc = reinterpret_cast<pD3DCompile>(GetProcAddress(mD3DCompilerModule, "D3DCompile")); @@ -155,7 +156,7 @@ gl::Error HLSLCompiler::initialize() if (mD3DCompileFunc == nullptr) { - return gl::Error(GL_INVALID_OPERATION, "Error finding D3DCompile entry point"); + return gl::Error(GL_OUT_OF_MEMORY, "Error finding D3DCompile entry point."); } mInitialized = true; |