diff options
| author | Michael Ludwig <michaelludwig@google.com> | 2019-02-01 21:53:11 +0000 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-02-01 21:53:22 +0000 |
| commit | 8f5aeebdd8eb77b624a9d802eac49c3c1de8deba (patch) | |
| tree | 38aedea2553300d2d1de88d018c27c7d3a0ec28b /src | |
| parent | 87685ba492a520eaeb2801e28e83d34cfa84ff84 (diff) | |
| download | skqp-8f5aeebdd8eb77b624a9d802eac49c3c1de8deba.tar.gz | |
Revert "Narrow clear-as-draw workaround on D3D11 ANGLE"
This reverts commit 3dc93896b3a9c368c9f051a20822c35fd2efc25c.
Reason for revert: Intel and ANGLE still don't play well together
Original change's description:
> Narrow clear-as-draw workaround on D3D11 ANGLE
>
> Bug: skia:
> Change-Id: Ib2714b448b078a09d43a28fd5bd7329706b516b8
> Reviewed-on: https://skia-review.googlesource.com/c/188310
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Auto-Submit: Michael Ludwig <michaelludwig@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=robertphillips@google.com,michaelludwig@google.com
Change-Id: I0ce3cecd97b0e696a3805166394ec7f55fbebe20
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/c/188639
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 14 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLUtil.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLUtil.h | 3 |
3 files changed, 6 insertions, 13 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index f4648a7c2d..a3da939791 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -2499,16 +2499,12 @@ void GrGLCaps::applyDriverCorrectnessWorkarounds(const GrGLContextInfo& ctxInfo, } #endif + // See crbug.com/755871. This could probably be narrowed to just partial clears as the driver + // bugs seems to involve clearing too much and not skipping the clear. + // See crbug.com/768134. This is also needed for full clears and was seen on an nVidia K620 + // but only for D3D11 ANGLE. if (GrGLANGLEBackend::kD3D11 == ctxInfo.angleBackend()) { - if (GrGLANGLEVendor::kIntel == ctxInfo.angleVendor()) { - // See crbug.com/755871. This driver bug involves clearing too much and ignoring the - // scissor bounds, so disable native partial clears but allow native fullscreen clears. - fPerformPartialClearsAsDraws = true; - } else if (GrGLANGLEVendor::kNVIDIA == ctxInfo.angleVendor()) { - // See crbug.com/768134. This is needed for full clears and was seen on an nVidia K620 - // but only for D3D11 ANGLE. - fPerformColorClearsAsDraws = true; - } + fPerformColorClearsAsDraws = true; } if (kAdreno430_GrGLRenderer == ctxInfo.renderer() || diff --git a/src/gpu/gl/GrGLUtil.cpp b/src/gpu/gl/GrGLUtil.cpp index dc3d61e95b..a031f95345 100644 --- a/src/gpu/gl/GrGLUtil.cpp +++ b/src/gpu/gl/GrGLUtil.cpp @@ -488,8 +488,6 @@ void GrGLGetANGLEInfoFromString(const char* rendererString, GrGLANGLEBackend* ba break; } } - } else if (strstr(rendererString, "NVIDIA")) { - *vendor = GrGLANGLEVendor::kNVIDIA; } if (strstr(rendererString, "Direct3D11")) { *backend = GrGLANGLEBackend::kD3D11; diff --git a/src/gpu/gl/GrGLUtil.h b/src/gpu/gl/GrGLUtil.h index d5fa399a4d..38c7135bfd 100644 --- a/src/gpu/gl/GrGLUtil.h +++ b/src/gpu/gl/GrGLUtil.h @@ -99,8 +99,7 @@ enum class GrGLANGLEBackend { enum class GrGLANGLEVendor { kUnknown, - kIntel, - kNVIDIA + kIntel }; enum class GrGLANGLERenderer { |