| Index: src/gpu/gl/GrGLCaps.h
|
| diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
|
| index dfc6233b6bc2a849b0d046cbb1eed14eb1d7c0ed..25c7889b973c183f4d8c2ec6183ded5415cc9da9 100644
|
| --- a/src/gpu/gl/GrGLCaps.h
|
| +++ b/src/gpu/gl/GrGLCaps.h
|
| @@ -374,7 +374,6 @@
|
| typedef GrDrawTargetCaps INHERITED;
|
| };
|
|
|
| -#include "GrGLSL.h"
|
|
|
| class GrGLSLCaps : public GrShaderCaps {
|
| public:
|
| @@ -439,12 +438,6 @@
|
| bool mustEnableSpecificAdvBlendEqs() const {
|
| return fAdvBlendEqInteraction == kSpecificEnables_AdvBlendEqInteraction;
|
| }
|
| -
|
| - bool mustDeclareFragmentShaderOutput() const {
|
| - return fGLSLGeneration > k110_GrGLSLGeneration;
|
| - }
|
| -
|
| - GrGLSLGeneration generation() const { return fGLSLGeneration; }
|
|
|
| /**
|
| * Returns a string containing the caps info.
|
| @@ -455,8 +448,6 @@
|
| // Must be called after fGeometryShaderSupport is initialized.
|
| void initShaderPrecisionTable(const GrGLContextInfo&, const GrGLInterface*);
|
|
|
| - GrGLSLGeneration fGLSLGeneration;
|
| -
|
| bool fDropsTileOnZeroDivide : 1;
|
| bool fFBFetchSupport : 1;
|
| bool fFBFetchNeedsCustomOutput : 1;
|
|
|