diff options
| author |  halcanary <halcanary@google.com> | 2016-06-07 17:21:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-07 17:21:10 -0700 |
| commit | 4dbbd04314cc0606f8d3bafe515c97e52c180f73 (patch) | |
| tree | 9c5f935ce0a61cf51d0dfe0d62f727b72f5e8481 /include/gpu/GrTypes.h | |
| parent | 50bcb189f8785a599a3024d8eba4681c2e8ca37a (diff) | |
SkLeanWindows.h: #include "Windows.h" fewer places
$ git grep -l '<windows.h>' include src
include/private/SkLeanWindows.h
$ git grep -l SkLeanWindows.h | grep '\.h$'
include/ports/SkTypeface_win.h
include/utils/win/SkHRESULT.h
include/utils/win/SkTScopedComPtr.h
include/views/SkEvent.h
src/core/SkMathPriv.h
src/ports/SkTypeface_win_dw.h
src/utils/SkThreadUtils_win.h
src/utils/win/SkWGL.h
The same for `#include <intrin.h>` that was found in SkMath.h.
Those functions that needed it are moved to SkMathPriv.h.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2041943002
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_chromium_compile_dbg_ng,win_chromium_compile_rel_ng
Review-Url: https://codereview.chromium.org/2041943002
Diffstat (limited to 'include/gpu/GrTypes.h')
| -rw-r--r-- | include/gpu/GrTypes.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h index 902594522d..979afb3b2f 100644 --- a/include/gpu/GrTypes.h +++ b/include/gpu/GrTypes.h @@ -108,20 +108,6 @@ static inline size_t GrSizeAlignDown(size_t x, uint32_t alignment) { /////////////////////////////////////////////////////////////////////////////// /** - * Return the next power of 2 >= n. - */ -static inline uint32_t GrNextPow2(uint32_t n) { - return n ? (1 << (32 - SkCLZ(n - 1))) : 1; -} - -static inline int GrNextPow2(int n) { - SkASSERT(n >= 0); // this impl only works for non-neg. - return n ? (1 << (32 - SkCLZ(n - 1))) : 1; -} - -/////////////////////////////////////////////////////////////////////////////// - -/** * Possible 3D APIs that may be used by Ganesh. */ enum GrBackend { |