AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change from std to skstd for aligned_union_t

Browse Source 
Change-Id: I67bd77cf072e203f23ffc49d591cb826fed598dd
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/258640
Commit-Queue: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Herb Derby <herb@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
This commit is contained in:
Herb Derby 2019-12-06 16:48:55 -05:00 committed by Skia Commit-Bot
parent cd498e151f
commit 99f228e285
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/private/SkTLogic.h
View File

@ -41,6 +41,9 @@ template <typename T> using result_of_t = typename std::result_of<T>::type;
template <typename... T> using common_type_t = typename std::common_type<T...>::type;
template <size_t size, typename... T> using aligned_union_t
= typename std::aligned_union<size, T...>::type;
template <std::size_t... Ints> struct index_sequence {
using type = index_sequence;
using value_type = std::size_t;

4
src/gpu/text/GrTextBlob.cpp
View File

@ -223,9 +223,9 @@ sk_sp<GrTextBlob> GrTextBlob::Make(int glyphCount,
GrColor color,
bool forceWForDistanceFields) {
size_t vertexSize = sizeof(std::aligned_union_t<0, Mask2DVertex, ARGB2DVertex>);
size_t vertexSize = sizeof(skstd::aligned_union_t<0, Mask2DVertex, ARGB2DVertex>);
if (viewMatrix.hasPerspective() || forceWForDistanceFields) {
vertexSize = sizeof(std::aligned_union_t<0, SDFT3DVertex, ARGB3DVertex>);
vertexSize = sizeof(skstd::aligned_union_t<0, SDFT3DVertex, ARGB3DVertex>);
}
size_t quadSize = kVerticesPerGlyph * vertexSize;