commit 9cf9e871a6bd2712df6b48efe1cd20b8391bbf10
author Jamie Madill <jmadill@chromium.org> Mon Jun 05 12:59:25 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Jun 12 19:24:33 2017 +0000
tree 1c856bb012cf56fc73cabb2aadd46c2475de2228
parent 83418fb19d7295cbae8e6d4445b36fd62a0ed66e

Move LinkResult to the gl:: namespace.

This is a derived type from gl::Error so makes sense to be there.
Also makes it more accessible than in ProgramImpl.h

BUG=angleproject:1897

Change-Id: Id41b13e5a072745d8c361057f5bef8f152e0452b
Reviewed-on: https://chromium-review.googlesource.com/522872
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: 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 3ebfbf6..87f5aa8 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -694,9 +694,9 @@
     }
 }
 
-LinkResult ProgramD3D::load(const gl::Context *context,
-                            gl::InfoLog &infoLog,
-                            gl::BinaryInputStream *stream)
+gl::LinkResult ProgramD3D::load(const gl::Context *context,
+                                gl::InfoLog &infoLog,
+                                gl::BinaryInputStream *stream)
 {
     // TODO(jmadill): Use Renderer from contextImpl.
 
@@ -1401,7 +1401,8 @@
     return gl::NoError();
 }
 
-LinkResult ProgramD3D::compileProgramExecutables(const gl::Context *context, gl::InfoLog &infoLog)
+gl::LinkResult ProgramD3D::compileProgramExecutables(const gl::Context *context,
+                                                     gl::InfoLog &infoLog)
 {
     // Ensure the compiler is initialized to avoid race conditions.
     ANGLE_TRY(mRenderer->ensureHLSLCompilerInitialized());
@@ -1458,7 +1459,8 @@
             (!usesGeometryShader(GL_POINTS) || pointGS));
 }
 
-LinkResult ProgramD3D::compileComputeExecutable(const gl::Context *context, gl::InfoLog &infoLog)
+gl::LinkResult ProgramD3D::compileComputeExecutable(const gl::Context *context,
+                                                    gl::InfoLog &infoLog)
 {
     // Ensure the compiler is initialized to avoid race conditions.
     ANGLE_TRY(mRenderer->ensureHLSLCompilerInitialized());
@@ -1485,9 +1487,9 @@
     return mComputeExecutable.get() != nullptr;
 }
 
-LinkResult ProgramD3D::link(const gl::Context *context,
-                            const gl::VaryingPacking &packing,
-                            gl::InfoLog &infoLog)
+gl::LinkResult ProgramD3D::link(const gl::Context *context,
+                                const gl::VaryingPacking &packing,
+                                gl::InfoLog &infoLog)
 {
     const auto &data = context->getContextState();
 
@@ -1500,7 +1502,7 @@
 
         defineUniformsAndAssignRegisters(context);
 
-        LinkResult result = compileComputeExecutable(context, infoLog);
+        gl::LinkResult result = compileComputeExecutable(context, infoLog);
         if (result.isError())
         {
             infoLog << result.getError().getMessage();
@@ -1574,7 +1576,7 @@
 
         gatherTransformFeedbackVaryings(packing, builtins[SHADER_VERTEX]);
 
-        LinkResult result = compileProgramExecutables(context, infoLog);
+        gl::LinkResult result = compileProgramExecutables(context, infoLog);
         if (result.isError())
         {
             infoLog << result.getError().getMessage();