Merge branch 'master' into vulkan

2020-12-13 18:41:07 +03:00
parent c14e3770a2
commit 4617dc5569
115 changed files with 4290 additions and 3872 deletions
--- a/src/xenia/gpu/sampler_info.cc
+++ b/src/xenia/gpu/sampler_info.cc
@@ -12,7 +12,7 @@
 #include <cstring>
 #include <memory>

-#include "third_party/xxhash/xxhash.h"
+#include "xenia/base/xxhash.h"

 namespace xe {
 namespace gpu {
@@ -51,7 +51,7 @@ bool SamplerInfo::Prepare(const xenos::xe_gpu_texture_fetch_t& fetch,
 }

 uint64_t SamplerInfo::hash() const {
-  return XXH64(this, sizeof(SamplerInfo), 0);
+  return XXH3_64bits(this, sizeof(SamplerInfo));
 }

 }  //  namespace gpu