aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/glsl/GrGLSLCaps.h
diff options
context:
space:
mode:
authorGravatar Leon Scroggins <scroggo@google.com>2016-11-11 15:50:45 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2016-11-11 15:51:01 +0000
commitb0b5360ae4078560b2f5f8508471129e4dd1cee6 (patch)
tree20b240c09f4d833fbd6f80f7dbce8447b5221f42 /src/gpu/glsl/GrGLSLCaps.h
parent8af38a96475ac5ce83b20c16d9cf82bf1006b8c4 (diff)
Revert "skslc now uses standard Skia caps"
This reverts commit 8af38a96475ac5ce83b20c16d9cf82bf1006b8c4. Reason for revert: Breaking compile bots, e.g. from https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Debug-NoGPU/builds/10029/steps/compile_skia%20on%20Ubuntu/logs/stdio : In function `sk_make_sp<GrGLSLCaps, GrContextOptions>' undefined reference to `GrGLSLCaps::GrGLSLCaps(GrContextOptions const&) In function `_Z10sk_make_spI10GrGLSLCapsI16GrContextOptionsEE5sk_spIT_EDpOT0_': undefined reference to `GrGLSLCaps::GrGLSLCaps(GrContextOptions const&) Original change's description: > skslc now uses standard Skia caps > > BUG=skia: > > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4660 > > Change-Id: Idaedae3f81426b97f5052bb872cdf0610e47a84f > Reviewed-on: https://skia-review.googlesource.com/4660 > Reviewed-by: Ben Wagner <benjaminwagner@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > TBR=bsalomon@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ic7f987f5c050ac2e333f5a0f16c8de85c1047a74 Reviewed-on: https://skia-review.googlesource.com/4697 Commit-Queue: Leon Scroggins <scroggo@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLCaps.h')
-rw-r--r--src/gpu/glsl/GrGLSLCaps.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gpu/glsl/GrGLSLCaps.h b/src/gpu/glsl/GrGLSLCaps.h
index 1a89d1690b..ac409a36ba 100644
--- a/src/gpu/glsl/GrGLSLCaps.h
+++ b/src/gpu/glsl/GrGLSLCaps.h
@@ -13,10 +13,6 @@
#include "GrGLSL.h"
#include "GrSwizzle.h"
-namespace SkSL {
- class GLSLCapsFactory;
-}
-
class GrGLSLCaps : public GrShaderCaps {
public:
@@ -235,7 +231,6 @@ private:
friend class GrGLCaps; // For initialization.
friend class GrVkCaps;
- friend class SkSL::GLSLCapsFactory;
typedef GrShaderCaps INHERITED;
};