aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrPrimitiveProcessor.h
diff options
context:
space:
mode:
authorGravatar ethannicholas <ethannicholas@google.com>2016-01-22 09:45:47 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-22 09:45:47 -0800
commit5366a09ed07e886dd5fd1b94828241c53df3726d (patch)
tree357aa47df476047ac6f5c37608344de2aa783c19 /src/gpu/GrPrimitiveProcessor.h
parent1c2729c8bbb19ec60a0148e143ae6516faf452d6 (diff)
Revert of added support for PLS path rendering (patchset #16 id:360001 of https://codereview.chromium.org/1541903002/ )
Reason for revert: ASAN failure at src/gpu/GrXferProcessor.cpp:224 Original issue's description: > added support for PLS path rendering > > BUG=skia:3555 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1541903002 > > Committed: https://skia.googlesource.com/skia/+/7df3f5e127f8016d17b637cc48a6a4718f1a6822 TBR=bsalomon@google.com,egdaniel@google.com,joshualitt@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:3555 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1626553002 Review URL: https://codereview.chromium.org/1626553002
Diffstat (limited to 'src/gpu/GrPrimitiveProcessor.h')
-rw-r--r--src/gpu/GrPrimitiveProcessor.h28
1 files changed, 6 insertions, 22 deletions
diff --git a/src/gpu/GrPrimitiveProcessor.h b/src/gpu/GrPrimitiveProcessor.h
index c1e946db20..467200a86d 100644
--- a/src/gpu/GrPrimitiveProcessor.h
+++ b/src/gpu/GrPrimitiveProcessor.h
@@ -47,16 +47,6 @@ class GrGLSLPrimitiveProcessor;
struct GrInitInvariantOutput;
-// Describes the state of pixel local storage with respect to the current draw.
-enum GrPixelLocalStorageState {
- // The draw is actively updating PLS.
- kDraw_GrPixelLocalStorageState,
- // The draw is a "finish" operation which is reading from PLS and writing color.
- kFinish_GrPixelLocalStorageState,
- // The draw does not use PLS.
- kDisabled_GrPixelLocalStorageState
-};
-
/*
* This class allows the GrPipeline to communicate information about the pipeline to a
* GrBatch which should be forwarded to the GrPrimitiveProcessor(s) created by the batch.
@@ -209,7 +199,7 @@ public:
the object. */
virtual GrGLSLPrimitiveProcessor* createGLSLInstance(const GrGLSLCaps& caps) const = 0;
- virtual bool isPathRendering() const { return false; }
+ bool isPathRendering() const { return fIsPathRendering; }
/**
* No Local Coord Transformation is needed in the shader, instead transformed local coords will
@@ -217,19 +207,11 @@ public:
*/
virtual bool hasTransformedLocalCoords() const = 0;
- virtual GrPixelLocalStorageState getPixelLocalStorageState() const {
- return kDisabled_GrPixelLocalStorageState;
- }
-
- /**
- * If non-null, overrides the dest color returned by GrGLSLFragmentShaderBuilder::dstColor().
- */
- virtual const char* getDestColorOverride() const { return nullptr; }
-
protected:
- GrPrimitiveProcessor()
+ GrPrimitiveProcessor(bool isPathRendering)
: fNumAttribs(0)
- , fVertexStride(0) {}
+ , fVertexStride(0)
+ , fIsPathRendering(isPathRendering) {}
Attribute fAttribs[kMaxVertexAttribs];
int fNumAttribs;
@@ -239,6 +221,8 @@ private:
void notifyRefCntIsZero() const final {};
virtual bool hasExplicitLocalCoords() const = 0;
+ bool fIsPathRendering;
+
typedef GrProcessor INHERITED;
};