Commit 30ca54f4 by Jamie Madill

D3D11: Fix mingw64 build.

Two small build errors were breaking ming64. BUG=angleproject:2071 Change-Id: Ia5c8e629e77c09f151b888364e92475b4c3f1709 Reviewed-on: https://chromium-review.googlesource.com/539796Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 125e220e
......@@ -33,7 +33,7 @@ struct PackedAttributeLayout;
namespace std
{
template <>
struct std::hash<rx::PackedAttributeLayout>
struct hash<rx::PackedAttributeLayout>
{
size_t operator()(const rx::PackedAttributeLayout &value) const
{
......
......@@ -20,6 +20,18 @@
namespace rx
{
// These two methods are declared here to prevent circular includes.
namespace d3d11
{
HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name);
template <typename T>
HRESULT SetDebugName(angle::ComPtr<T> &resource, const char *name)
{
return SetDebugName(resource.Get(), name);
}
} // namespace d3d11
class Renderer11;
class ResourceManager11;
template <typename T>
......
......@@ -145,14 +145,6 @@ struct RasterizerStateKey final
bool operator==(const RasterizerStateKey &a, const RasterizerStateKey &b);
bool operator!=(const RasterizerStateKey &a, const RasterizerStateKey &b);
HRESULT SetDebugName(ID3D11DeviceChild *resource, const char *name);
template <typename T>
HRESULT SetDebugName(angle::ComPtr<T> &resource, const char *name)
{
return SetDebugName(resource.Get(), name);
}
template <typename outType>
outType* DynamicCastComObject(IUnknown* object)
{
......
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