diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-06-15 15:37:57 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-15 16:26:05 +0000 |
| commit | b0897650f1f4279d335994284bd15f972dee57bc (patch) | |
| tree | 853f301a1e32b1fceb9714a582ddece676ac5a04 /src/gpu/GrProgramDesc.cpp | |
| parent | 46f25635474e6b1e4289cf9fd5f6c3ddd3696ead (diff) | |
Reland "Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines."
This reverts commit ab17347df32807cabd9f2a518d22c3bd420e482f.
Reason for revert: Chromium should now be ok.
Original change's description:
> Revert "Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines."
>
> This reverts commit e1bc7de7c07686b28b00b850e44e0722189f3592.
>
> Reason for revert: chrome used it
>
> Original change's description:
> > Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines.
> >
> > sed 's/SK_MaxSizeT/SIZE_MAX/g'
> > sed 's/SK_MaxU32/UINT32_MAX/g'
> > sed 's/SK_MaxU16/UINT16_MAX/g'
> >
> > SK_MinU32 and SK_MinU16 were unused
> >
> > Change-Id: I6b6c824df47b05bde7e73b13a58e851a5f63fe0e
> > Reviewed-on: https://skia-review.googlesource.com/134607
> > Commit-Queue: Hal Canary <halcanary@google.com>
> > Reviewed-by: Ben Wagner <bungeman@google.com>
>
> TBR=halcanary@google.com,bungeman@google.com,reed@google.com
>
> Change-Id: I1e2c440dcf9f59bf87c1fea113248cd5136f7519
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://skia-review.googlesource.com/134921
> Reviewed-by: Hal Canary <halcanary@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
CQ_INCLUDE_TRYBOTS=luci.chromium.try:linux-ozone-rel
TBR=halcanary@google.com,bungeman@google.com,reed@google.com
Change-Id: I7709f9715bea0463b85b5b0a89712ac1020fcddb
Reviewed-on: https://skia-review.googlesource.com/135180
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/gpu/GrProgramDesc.cpp')
| -rw-r--r-- | src/gpu/GrProgramDesc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp index b73a439688..c552789d9f 100644 --- a/src/gpu/GrProgramDesc.cpp +++ b/src/gpu/GrProgramDesc.cpp @@ -102,7 +102,7 @@ static bool gen_meta_key(const GrResourceIOProcessor& proc, uint32_t classID = proc.classID(); // Currently we allow 16 bits for the class id and the overall processor key size. - static const uint32_t kMetaKeyInvalidMask = ~((uint32_t)SK_MaxU16); + static const uint32_t kMetaKeyInvalidMask = ~((uint32_t)UINT16_MAX); if ((processorKeySize | classID) & kMetaKeyInvalidMask) { return false; } @@ -122,7 +122,7 @@ static bool gen_meta_key(const GrXferProcessor& xp, uint32_t classID = xp.classID(); // Currently we allow 16 bits for the class id and the overall processor key size. - static const uint32_t kMetaKeyInvalidMask = ~((uint32_t)SK_MaxU16); + static const uint32_t kMetaKeyInvalidMask = ~((uint32_t)UINT16_MAX); if ((processorKeySize | classID) & kMetaKeyInvalidMask) { return false; } |