commit 189ad877d8c55e25e249f97781bcc4fdada4e644
author Jamie Madill <jmadill@chromium.org> Mon Jul 09 13:32:37 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Jul 09 19:16:41 2018 +0000
tree 4deea3b5a2092133f601ec3899c14aeb63e0ad4b
parent d7890bca9b35d6b0839ace3f77f02233f15c566c

Return an Error from ContextImpl::syncState.

This will allow the Vulkan back-end to call Vulkan commands that return
VkResult within syncState.

Bug: angleproject:2717
Change-Id: I05e1379e71acaac56bcc9493c8561e82da000934
Reviewed-on: https://chromium-review.googlesource.com/1120150
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Luc Ferron <lucferron@chromium.org>

src/libANGLE/renderer/null/ContextNULL.cpp

diff --git a/src/libANGLE/renderer/null/ContextNULL.cpp b/src/libANGLE/renderer/null/ContextNULL.cpp
index d7e5e6c..b288c23 100644
--- a/src/libANGLE/renderer/null/ContextNULL.cpp
+++ b/src/libANGLE/renderer/null/ContextNULL.cpp
@@ -295,8 +295,9 @@
 {
 }
 
-void ContextNULL::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
+gl::Error ContextNULL::syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits)
 {
+    return gl::NoError();
 }
 
 GLint ContextNULL::getGPUDisjoint()

src/libANGLE/renderer/null/ContextNULL.h

diff --git a/src/libANGLE/renderer/null/ContextNULL.h b/src/libANGLE/renderer/null/ContextNULL.h
index 636e41f..760263c 100644
--- a/src/libANGLE/renderer/null/ContextNULL.h
+++ b/src/libANGLE/renderer/null/ContextNULL.h
@@ -142,7 +142,7 @@
     void popDebugGroup() override;
 
     // State sync with dirty bits.
-    void syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
+    gl::Error syncState(const gl::Context *context, const gl::State::DirtyBits &dirtyBits) override;
 
     // Disjoint timer queries
     GLint getGPUDisjoint() override;