aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrSwizzle.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2016-01-08 12:11:39 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-08 12:11:39 -0800
commit3183a4136364cfe18b3584302e71ea528a018401 (patch)
tree00dc9f7509516757e84de9c311a413743af1275f /src/gpu/GrSwizzle.h
parentdefa0daa6a0f4e97a3527a522ae602c6771a7c80 (diff)
Revert of Add a class representing texture swizzle. (patchset #6 id:100001 of https://codereview.chromium.org/1567733005/ )
Reason for revert: Shader compilation failures when implicitly converting vec4 to float. https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Win8-MSVC-ShuttleA-GPU-GTX960-x86_64-Debug/builds/3266/steps/dm/logs/stdio https://uberchromegw.corp.google.com/i/client.skia.android/builders/Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug/builds/3154/steps/dm/logs/stdio Original issue's description: > Add a class representing texture swizzle. > > Store config swizzle GrGLCaps and shader swizzles in GrGLSLCaps. > > Remove GrTextureAccess's swizzle and update users of it to swizzle in their shader code. > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1567733005 > > Committed: https://skia.googlesource.com/skia/+/1a1efeacf7cc94a8c2977114dfe230fed3efc105 TBR=egdaniel@google.com,bsalomon@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1569393002
Diffstat (limited to 'src/gpu/GrSwizzle.h')
-rw-r--r--src/gpu/GrSwizzle.h92
1 files changed, 0 insertions, 92 deletions
diff --git a/src/gpu/GrSwizzle.h b/src/gpu/GrSwizzle.h
deleted file mode 100644
index 87ea9534b9..0000000000
--- a/src/gpu/GrSwizzle.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef GrSwizzle_DEFINED
-#define GrSwizzle_DEFINED
-
-#include "GrTypes.h"
-
-/** Represents a rgba swizzle. It can be converted either into a string or a eight bit int.
- Currently there is no way to specify an arbitrary swizzle, just some static swizzles and an
- assignment operator. That could be relaxed. */
-class GrSwizzle {
-public:
- GrSwizzle() { *this = RGBA(); }
-
- GrSwizzle& operator=(const GrSwizzle& that) {
- memcpy(this, &that, sizeof(GrSwizzle));
- return *this;
- }
-
- bool operator==(const GrSwizzle& that) const { return this->asUInt() == that.asUInt(); }
-
- bool operator!=(const GrSwizzle& that) const { return !(*this == that); }
-
- /** Compact representation of the swizzle suitable for a key. */
- uint8_t asKey() const { return fKey; }
-
- /** 4 char null terminated string consisting only of chars 'r', 'g', 'b', 'a'. */
- const char* c_str() const { return fSwiz; }
-
- static const GrSwizzle& RGBA() {
- static GrSwizzle gRGBA("rgba");
- return gRGBA;
- }
-
- static const GrSwizzle& AAAA() {
- static GrSwizzle gAAAA("aaaa");
- return gAAAA;
- }
-
- static const GrSwizzle& RRRR() {
- static GrSwizzle gRRRR("rrrr");
- return gRRRR;
- }
-
- static const GrSwizzle& BGRA() {
- static GrSwizzle gBGRA("bgra");
- return gBGRA;
- }
-
-private:
- char fSwiz[5];
- uint8_t fKey;
-
- static int CharToIdx(char c) {
- switch (c) {
- case 'r':
- return 0;
- case 'g':
- return 1;
- case 'b':
- return 2;
- case 'a':
- return 3;
- default:
- SkFAIL("Invalid swizzle char");
- return 0;
- }
- }
-
- explicit GrSwizzle(const char* str) {
- SkASSERT(strlen(str) == 4);
- fSwiz[0] = str[0];
- fSwiz[1] = str[1];
- fSwiz[2] = str[2];
- fSwiz[3] = str[3];
- fSwiz[4] = 0;
- fKey = SkToU8(CharToIdx(fSwiz[0]) | (CharToIdx(fSwiz[1]) << 2) |
- (CharToIdx(fSwiz[2]) << 4) | (CharToIdx(fSwiz[3]) << 6));
- }
-
- uint32_t* asUIntPtr() { return SkTCast<uint32_t*>(fSwiz); }
- uint32_t asUInt() const { return *SkTCast<const uint32_t*>(fSwiz); }
-
- GR_STATIC_ASSERT(sizeof(char[4]) == sizeof(uint32_t));
-};
-
-#endif