D3D11: Use angle::Result error pattern. 2/3

src/libANGLE/renderer/d3d/DisplayD3D.cpp

@@ -359,4 +359,18 @@ gl::Version DisplayD3D::getMaxSupportedESVersion() const
     return mRenderer->getMaxSupportedESVersion();
 }
 
+void DisplayD3D::handleError(HRESULT hr,
+                             const char *message,
+                             const char *file,
+                             const char *function,
+                             unsigned int line)
+{
+    ASSERT(FAILED(hr));
+
+    std::stringstream errorStream;
+    errorStream << "Internal D3D11 error: " << gl::FmtHR(hr) << ", in " << file << ", " << function
+                << ":" << line << ". " << message;
+
+    mStoredErrorString = errorStream.str();
+}
 }  // namespace rx

src/libANGLE/renderer/d3d/DisplayD3D.h

@@ -12,11 +12,11 @@
 #include "libANGLE/renderer/DisplayImpl.h"
 #include "libANGLE/Device.h"
 
+#include "libANGLE/renderer/d3d/RendererD3D.h"
+
 namespace rx
 {
-class RendererD3D;
-
-class DisplayD3D : public DisplayImpl
+class DisplayD3D : public DisplayImpl, public d3d::Context
 {
   public:
     DisplayD3D(const egl::DisplayState &state);
@@ -72,6 +72,14 @@ class DisplayD3D : public DisplayImpl
     egl::Error waitNative(const gl::Context *context, EGLint engine) override;
     gl::Version getMaxSupportedESVersion() const override;
 
+    void handleError(HRESULT hr,
+                     const char *message,
+                     const char *file,
+                     const char *function,
+                     unsigned int line) override;
+
+    const std::string &getStoredErrorString() const { return mStoredErrorString; }
+
   private:
     void generateExtensions(egl::DisplayExtensions *outExtensions) const override;
     void generateCaps(egl::Caps *outCaps) const override;
@@ -79,8 +87,9 @@ class DisplayD3D : public DisplayImpl
     egl::Display *mDisplay;
 
     rx::RendererD3D *mRenderer;
+    std::string mStoredErrorString;
 };
 
-}
+}  // namespace rx
 
 #endif // LIBANGLE_RENDERER_D3D_DISPLAYD3D_H_

src/libANGLE/renderer/d3d/RendererD3D.h

@@ -73,6 +73,23 @@ enum RendererClass
     RENDERER_D3D9
 };
 
+// A d3d::Context wraps error handling.
+namespace d3d
+{
+class Context : angle::NonCopyable
+{
+  public:
+    Context() {}
+    virtual ~Context() {}
+
+    virtual void handleError(HRESULT hr,
+                             const char *message,
+                             const char *file,
+                             const char *function,
+                             unsigned int line) = 0;
+};
+}  // namespace d3d
+
 // ANGLE_TRY for HRESULT errors.
 #define ANGLE_TRY_HR(CONTEXT, EXPR, MESSAGE)                                                    \
     \

src/libANGLE/renderer/d3d/d3d11/Context11.h

@@ -12,11 +12,13 @@
 
 #include "libANGLE/renderer/ContextImpl.h"
 
+#include "libANGLE/renderer/d3d/RendererD3D.h"
+
 namespace rx
 {
 class Renderer11;
 
-class Context11 : public ContextImpl, public MultisampleTextureInitializer
+class Context11 : public ContextImpl, public MultisampleTextureInitializer, public d3d::Context
 {
   public:
     Context11(const gl::ContextState &state, Renderer11 *renderer);
@@ -161,7 +163,7 @@ class Context11 : public ContextImpl, public MultisampleTextureInitializer
                      const char *message,
                      const char *file,
                      const char *function,
-                     unsigned int line);
+                     unsigned int line) override;
 
     // TODO(jmadill): Remove this once refactor is complete. http://anglebug.com/2738
     void handleError(const gl::Error &error);
@@ -173,7 +175,6 @@ class Context11 : public ContextImpl, public MultisampleTextureInitializer
     Renderer11 *mRenderer;
     IncompleteTextureSet mIncompleteTextures;
 };
-
 }  // namespace rx
 
 #endif  // LIBANGLE_RENDERER_D3D_D3D11_CONTEXT11_H_