diff options
| author |  mtklein <mtklein@google.com> | 2015-05-18 09:29:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-18 09:29:10 -0700 |
| commit | 404b3b264b833eb7cffdc833c7e2ebbd708e123a (patch) | |
| tree | f6a2a9229d9db90b4ec97f29a9fb6f5876f99229 /src/gpu/gl/GrGLCaps.h | |
| parent | 9b777967b1e531d0ebdb3349c4bd149fdb86589f (diff) | |
Revert of Move copy-surface-as-draw fallback to GrGLGpu. (patchset #12 id:220001 of https://codereview.chromium.org/1144433002/)
Reason for revert:
Many GMs changed, some totally busted.
Original issue's description:
> Move copy-surface-as-draw fallback to GrGLGpu.
>
> Committed: https://skia.googlesource.com/skia/+/5df6fee929823f50c55cc50f7c882a309c1b1de9
TBR=joshualitt@google.com,egdaniel@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1142003003
Diffstat (limited to 'src/gpu/gl/GrGLCaps.h')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h index dfc6233b6b..25c7889b97 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/gl/GrGLCaps.h @@ -374,7 +374,6 @@ private: typedef GrDrawTargetCaps INHERITED; }; -#include "GrGLSL.h" class GrGLSLCaps : public GrShaderCaps { public: @@ -439,12 +438,6 @@ public: 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 @@ private: // Must be called after fGeometryShaderSupport is initialized. void initShaderPrecisionTable(const GrGLContextInfo&, const GrGLInterface*); - GrGLSLGeneration fGLSLGeneration; - bool fDropsTileOnZeroDivide : 1; bool fFBFetchSupport : 1; bool fFBFetchNeedsCustomOutput : 1; |