aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu/GrTypesPriv.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 /include/gpu/GrTypesPriv.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 'include/gpu/GrTypesPriv.h')
-rw-r--r--include/gpu/GrTypesPriv.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h
index 491b23b37b..16e2b0bc56 100644
--- a/include/gpu/GrTypesPriv.h
+++ b/include/gpu/GrTypesPriv.h
@@ -12,10 +12,10 @@
#include "SkTArray.h"
#include "SkRect.h"
- /**
- * Types of shader-language-specific boxed variables we can create. (Currently only GrGLShaderVars,
- * but should be applicable to other shader languages.)
- */
+/**
+ * Types of shader-language-specific boxed variables we can create. (Currently only GrGLShaderVars,
+ * but should be applicable to other shader languages.)
+ */
enum GrSLType {
kVoid_GrSLType,
kFloat_GrSLType,