Commit 0492d447 by Kai Ninomiya Committed by Commit Bot

Move murmurhash to src/common/third_party

Bug: chromium:697758 Change-Id: I8a3a990b14cde0fdd45319d593040bfc571abf3e Reviewed-on: https://chromium-review.googlesource.com/527602 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 60f6eb20
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "libANGLE/renderer/d3d/d3d11/InputLayoutCache.h" #include "libANGLE/renderer/d3d/d3d11/InputLayoutCache.h"
#include "common/bitset_utils.h" #include "common/bitset_utils.h"
#include "common/third_party/murmurhash/MurmurHash3.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "libANGLE/Program.h" #include "libANGLE/Program.h"
#include "libANGLE/VertexArray.h" #include "libANGLE/VertexArray.h"
...@@ -22,7 +23,6 @@ ...@@ -22,7 +23,6 @@
#include "libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h" #include "libANGLE/renderer/d3d/d3d11/ShaderExecutable11.h"
#include "libANGLE/renderer/d3d/d3d11/VertexBuffer11.h" #include "libANGLE/renderer/d3d/d3d11/VertexBuffer11.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h" #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
#include "third_party/murmurhash/MurmurHash3.h"
namespace rx namespace rx
{ {
......
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
#include <float.h> #include <float.h>
#include "common/debug.h" #include "common/debug.h"
#include "common/third_party/murmurhash/MurmurHash3.h"
#include "libANGLE/Framebuffer.h" #include "libANGLE/Framebuffer.h"
#include "libANGLE/FramebufferAttachment.h" #include "libANGLE/FramebufferAttachment.h"
#include "libANGLE/renderer/d3d/FramebufferD3D.h" #include "libANGLE/renderer/d3d/FramebufferD3D.h"
#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h" #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h" #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
#include "third_party/murmurhash/MurmurHash3.h"
namespace rx namespace rx
{ {
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
'common/third_party/base/anglebase/numerics/safe_conversions_impl.h', 'common/third_party/base/anglebase/numerics/safe_conversions_impl.h',
'common/third_party/base/anglebase/numerics/safe_math.h', 'common/third_party/base/anglebase/numerics/safe_math.h',
'common/third_party/base/anglebase/numerics/safe_math_impl.h', 'common/third_party/base/anglebase/numerics/safe_math_impl.h',
'common/third_party/murmurhash/MurmurHash3.cpp',
'common/third_party/murmurhash/MurmurHash3.h',
'common/tls.cpp', 'common/tls.cpp',
'common/tls.h', 'common/tls.h',
'common/utilities.cpp', 'common/utilities.cpp',
...@@ -264,8 +266,6 @@ ...@@ -264,8 +266,6 @@
'libANGLE/validationES3.h', 'libANGLE/validationES3.h',
'libANGLE/validationES31.cpp', 'libANGLE/validationES31.cpp',
'libANGLE/validationES31.h', 'libANGLE/validationES31.h',
'third_party/murmurhash/MurmurHash3.cpp',
'third_party/murmurhash/MurmurHash3.h',
'third_party/trace_event/trace_event.h', 'third_party/trace_event/trace_event.h',
], ],
'libangle_d3d_shared_sources': 'libangle_d3d_shared_sources':
......
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