diff options
| author |  mtklein <mtklein@chromium.org> | 2016-06-09 12:20:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-09 12:20:10 -0700 |
| commit | e239547269c7e6677a7ed6ecdf67234fda662427 (patch) | |
| tree | a6b15a51f1bdf53d1bc253a48994e3c5a97d214d /src/gpu/gl | |
| parent | 71491dc14cff017e175ae5eb555490559de67914 (diff) | |
Revert of Add control of manual mipmapping to GrContextOptions (patchset #2 id:20001 of https://codereview.chromium.org/2054623003/ )
Reason for revert:
https://build.chromium.org/p/client.skia/builders/Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Debug-ASAN/builds/3481/steps/test_skia%20on%20Ubuntu/logs/stdio
../../../src/gpu/gl/GrGLCaps.cpp:554:25: runtime error: load of value 187, which is not a valid value for type 'bool'
SUMMARY: AddressSanitizer: undefined-behavior ../../../src/gpu/gl/GrGLCaps.cpp:554:25 in
step returned non-zero exit code: 1
Original issue's description:
> Add control of manual mipmapping to GrContextOptions
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2054623003
>
> Committed: https://skia.googlesource.com/skia/+/97e398d98928f9497063594ebe633efe2d0f4968
TBR=bsalomon@google.com,brianosman@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/2050373002
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 7ca2bf9a47..260521187a 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -551,8 +551,7 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, // glGenerateMipmap. Our implementation requires mip-level sampling control. Additionally, // it can be much slower (especially on mobile GPUs), so we opt-in only when necessary: if (fMipMapLevelAndLodControlSupport && - (contextOptions.fDoManualMipmapping || - (kIntel_GrGLVendor == ctxInfo.vendor()) || + ((kIntel_GrGLVendor == ctxInfo.vendor()) || (kNVIDIA_GrGLDriver == ctxInfo.driver() && isMAC) || (kATI_GrGLVendor == ctxInfo.vendor()))) { fDoManualMipmapping = true; |