Fix CL collision (rm SLType Byte type usage)
Change-Id: I47ff2b564f4ab785085657f84c095e2a97d65107
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/463737
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/experimental/graphite/src/UniformManager.cpp b/experimental/graphite/src/UniformManager.cpp
index 31ccf55..9cd7a04 100644
--- a/experimental/graphite/src/UniformManager.cpp
+++ b/experimental/graphite/src/UniformManager.cpp
@@ -259,17 +259,6 @@
// are. This works since all alignments are powers of 2. The mask is always (alignment - 1).
static uint32_t sltype_to_alignment_mask(SLType type) {
switch(type) {
- case SLType::kByte: // fall through
- case SLType::kUByte:
- return 0x0;
- case SLType::kByte2: // fall through
- case SLType::kUByte2:
- return 0x1;
- case SLType::kByte3: // fall through
- case SLType::kByte4:
- case SLType::kUByte3:
- case SLType::kUByte4:
- return 0x3;
case SLType::kShort: // fall through
case SLType::kUShort:
return 0x1;
@@ -334,22 +323,6 @@
/** Returns the size in bytes taken up in Metal buffers for GrSLTypes. */
inline uint32_t sltype_to_mtl_size(SLType type) {
switch(type) {
- case SLType::kByte:
- return sizeof(int8_t);
- case SLType::kByte2:
- return 2 * sizeof(int8_t);
- case SLType::kByte3:
- return 4 * sizeof(int8_t);
- case SLType::kByte4:
- return 4 * sizeof(int8_t);
- case SLType::kUByte:
- return sizeof(uint8_t);
- case SLType::kUByte2:
- return 2 * sizeof(uint8_t);
- case SLType::kUByte3:
- return 4 * sizeof(uint8_t);
- case SLType::kUByte4:
- return 4 * sizeof(uint8_t);
case SLType::kShort:
return sizeof(int16_t);
case SLType::kShort2:
