75419f87e5
* Define ANGLE_PLATFORM_WINDOWS instead of _WIN32. * Add arm64 target for mingw toolchain gn file. * Use -msse3 flag for x86 and x86_64 only.
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
diff --git a/src/common/mathutil.h b/src/common/mathutil.h
|
|
index 5609292..2338d2f 100644
|
|
--- a/src/common/mathutil.h
|
|
+++ b/src/common/mathutil.h
|
|
@@ -1027,7 +1027,7 @@ inline uint32_t BitfieldReverse(uint32_t value)
|
|
}
|
|
|
|
// Count the 1 bits.
|
|
-#if defined(_MSC_VER) && !defined(__clang__)
|
|
+#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(__clang__)
|
|
# if defined(_M_IX86) || defined(_M_X64)
|
|
namespace priv
|
|
{
|
|
@@ -1104,7 +1104,7 @@ inline int BitCount(uint64_t bits)
|
|
return static_cast<int>(vget_lane_u64(vpaddl_u32(vpaddl_u16(vpaddl_u8(vsum))), 0));
|
|
}
|
|
# endif // defined(_M_IX86) || defined(_M_X64)
|
|
-#endif // defined(_MSC_VER) && !defined(__clang__)
|
|
+#endif // defined(ANGLE_PLATFORM_WINDOWS) && !defined(__clang__)
|
|
|
|
#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__)
|
|
inline int BitCount(uint32_t bits)
|
|
diff --git a/src/common/serializer/JsonSerializer.cpp b/src/common/serializer/JsonSerializer.cpp
|
|
index 0028331d9..e675c406b 100644
|
|
--- a/src/common/serializer/JsonSerializer.cpp
|
|
+++ b/src/common/serializer/JsonSerializer.cpp
|
|
@@ -173,7 +173,7 @@ void JsonSerializer::addValue(const std::string &name, rapidjson::Value &&value)
|
|
}
|
|
else
|
|
{
|
|
- rapidjson::Value nameValue(name, mAllocator);
|
|
+ rapidjson::Value nameValue;
|
|
mDoc.AddMember(nameValue, std::move(value), mAllocator);
|
|
}
|
|
}
|
|
diff --git a/util/capture/frame_capture_test_utils.cpp b/util/capture/frame_capture_test_utils.cpp
|
|
index 41d52c0d9..a315ecbf2 100644
|
|
--- a/util/capture/frame_capture_test_utils.cpp
|
|
+++ b/util/capture/frame_capture_test_utils.cpp
|
|
@@ -85,7 +85,7 @@ bool LoadTraceInfoFromJSON(const std::string &traceName,
|
|
return false;
|
|
}
|
|
|
|
- const rapidjson::Document::Object &meta = doc["TraceMetadata"].GetObj();
|
|
+ const rapidjson::Document::Object &meta = doc["TraceMetadata"].GetObject();
|
|
|
|
strncpy(traceInfoOut->name, traceName.c_str(), kTraceInfoMaxNameLen);
|
|
traceInfoOut->contextClientMajorVersion = meta["ContextClientMajorVersion"].GetInt();
|