| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 #include "GrContext.h" | 9 #include "GrContext.h" |
| 10 | 10 |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 leakyProperties, | 230 leakyProperties, |
| 231 bool enableDistanceFieldFonts) { | 231 bool enableDistanceFieldFonts) { |
| 232 if (fGpu->caps()->pathRenderingSupport() && renderTarget->isMultisampled())
{ | 232 if (fGpu->caps()->pathRenderingSupport() && renderTarget->isMultisampled())
{ |
| 233 GrStencilBuffer* sb = renderTarget->renderTargetPriv().attachStencilBuff
er(); | 233 GrStencilBuffer* sb = renderTarget->renderTargetPriv().attachStencilBuff
er(); |
| 234 if (sb) { | 234 if (sb) { |
| 235 return GrStencilAndCoverTextContext::Create(this, gpuDevice, leakyPr
operties); | 235 return GrStencilAndCoverTextContext::Create(this, gpuDevice, leakyPr
operties); |
| 236 } | 236 } |
| 237 } | 237 } |
| 238 | 238 |
| 239 #ifdef USE_BITMAP_TEXTBLOBS | 239 #ifdef USE_BITMAP_TEXTBLOBS |
| 240 return GrBitmapTextContextB::Create(this, gpuDevice, leakyProperties); | 240 return GrAtlasTextContext::Create(this, gpuDevice, leakyProperties); |
| 241 #else | 241 #else |
| 242 return GrDistanceFieldTextContext::Create(this, gpuDevice, leakyProperties, | 242 return GrDistanceFieldTextContext::Create(this, gpuDevice, leakyProperties, |
| 243 enableDistanceFieldFonts); | 243 enableDistanceFieldFonts); |
| 244 #endif | 244 #endif |
| 245 } | 245 } |
| 246 | 246 |
| 247 //////////////////////////////////////////////////////////////////////////////// | 247 //////////////////////////////////////////////////////////////////////////////// |
| 248 enum ScratchTextureFlags { | 248 enum ScratchTextureFlags { |
| 249 kExact_ScratchTextureFlag = 0x1, | 249 kExact_ScratchTextureFlag = 0x1, |
| 250 kNoPendingIO_ScratchTextureFlag = 0x2, | 250 kNoPendingIO_ScratchTextureFlag = 0x2, |
| (...skipping 1762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2013 } | 2013 } |
| 2014 } | 2014 } |
| 2015 | 2015 |
| 2016 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { | 2016 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { |
| 2017 fGpu->removeGpuTraceMarker(marker); | 2017 fGpu->removeGpuTraceMarker(marker); |
| 2018 if (fDrawBuffer) { | 2018 if (fDrawBuffer) { |
| 2019 fDrawBuffer->removeGpuTraceMarker(marker); | 2019 fDrawBuffer->removeGpuTraceMarker(marker); |
| 2020 } | 2020 } |
| 2021 } | 2021 } |
| 2022 | 2022 |
| OLD | NEW |