diff options
| author |  rmistry <rmistry@google.com> | 2016-07-04 17:45:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-04 17:45:06 -0700 |
| commit | 42e6798696ac3a93a2b7ba7a9d6a84b77eba0116 (patch) | |
| tree | 684c6f7e2380f0a91b348f4eff8fbd3fb9dd4f21 /include/gpu/GrRenderTarget.h | |
| parent | 09d49a3bfe2d1e652a648ce1ea0962b38d10d166 (diff) | |
Revert of Fix caching of sample locations (patchset #3 id:40001 of https://codereview.chromium.org/2111423002/ )
Reason for revert:
Seems to be causing Chromium roll failures:
* https://codereview.chromium.org/2120373003
* https://codereview.chromium.org/2117193002
* https://codereview.chromium.org/2124653002
Original issue's description:
> Fix caching of sample locations
>
> The original caching logic for sample locations wishfully assumed that
> the GPU would always use the same sample pattern for render targets
> that had the same number of samples. It turns out we can't rely on
> that. This change improves the caching logic to handle mismatched
> simple patterns with the same count, and adds a unit test that
> emulates different sample patterns observed on real hardware.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2111423002
>
> Committed: https://skia.googlesource.com/skia/+/09d49a3bfe2d1e652a648ce1ea0962b38d10d166
TBR=bsalomon@google.com,csmartdalton@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2120403002
Diffstat (limited to 'include/gpu/GrRenderTarget.h')
| -rw-r--r-- | include/gpu/GrRenderTarget.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h index 77b04d24d3..ff75af37e8 100644 --- a/include/gpu/GrRenderTarget.h +++ b/include/gpu/GrRenderTarget.h @@ -163,7 +163,6 @@ protected: SampleConfig sampleConfig, GrStencilAttachment* stencil = nullptr) : INHERITED(gpu, desc) , fStencilAttachment(stencil) - , fMultisampleSpecsID(0) , fSampleConfig(sampleConfig) , fLastDrawTarget(nullptr) { fResolveRect.setLargestInverted(); @@ -185,7 +184,6 @@ private: friend class GrRenderTargetPriv; GrStencilAttachment* fStencilAttachment; - uint8_t fMultisampleSpecsID; SampleConfig fSampleConfig; SkIRect fResolveRect; |