Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: src/gpu/GrGpu.cpp

Issue 1260293004: Revert of Move draw on upload decision in GrGpu (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/GrGpu.h ('k') | src/gpu/GrTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 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 9
10 #include "GrGpu.h" 10 #include "GrGpu.h"
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 } 225 }
226 226
227 void GrGpu::clearStencilClip(const SkIRect& rect, 227 void GrGpu::clearStencilClip(const SkIRect& rect,
228 bool insideClip, 228 bool insideClip,
229 GrRenderTarget* renderTarget) { 229 GrRenderTarget* renderTarget) {
230 SkASSERT(renderTarget); 230 SkASSERT(renderTarget);
231 this->handleDirtyContext(); 231 this->handleDirtyContext();
232 this->onClearStencilClip(renderTarget, rect, insideClip); 232 this->onClearStencilClip(renderTarget, rect, insideClip);
233 } 233 }
234 234
235 bool GrGpu::getReadPixelsInfo(GrSurface* srcSurface, int width, int height, size _t rowBytes,
236 GrPixelConfig readConfig, DrawPreference* drawPref erence,
237 ReadPixelTempDrawInfo* tempDrawInfo) {
238 SkASSERT(drawPreference);
239 SkASSERT(tempDrawInfo);
240 SkASSERT(kGpuPrefersDraw_DrawPreference != *drawPreference);
241
242 if (!this->onGetReadPixelsInfo(srcSurface, width, height, rowBytes, readConf ig, drawPreference,
243 tempDrawInfo)) {
244 return false;
245 }
246
247 // Check to see if we're going to request that the caller draw when drawing is not possible.
248 if (!srcSurface->asTexture() ||
249 !this->caps()->isConfigRenderable(tempDrawInfo->fTempSurfaceDesc.fConfig , false)) {
250 // If we don't have a fallback to a straight read then fail.
251 if (kRequireDraw_DrawPreference == *drawPreference) {
252 return false;
253 }
254 *drawPreference = kNoDraw_DrawPreference;
255 }
256
257 return true;
258 }
259 bool GrGpu::getWritePixelsInfo(GrSurface* dstSurface, int width, int height, siz e_t rowBytes,
260 GrPixelConfig srcConfig, DrawPreference* drawPref erence,
261 WritePixelTempDrawInfo* tempDrawInfo) {
262 SkASSERT(drawPreference);
263 SkASSERT(tempDrawInfo);
264 SkASSERT(kGpuPrefersDraw_DrawPreference != *drawPreference);
265
266 if (this->caps()->useDrawInsteadOfPartialRenderTargetWrite() &&
267 SkToBool(dstSurface->asRenderTarget()) &&
268 (width < dstSurface->width() || height < dstSurface->height())) {
269 ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
270 }
271
272 if (!this->onGetWritePixelsInfo(dstSurface, width, height, rowBytes, srcConf ig, drawPreference,
273 tempDrawInfo)) {
274 return false;
275 }
276
277 // Check to see if we're going to request that the caller draw when drawing is not possible.
278 if (!dstSurface->asRenderTarget() ||
279 !this->caps()->isConfigTexturable(tempDrawInfo->fTempSurfaceDesc.fConfig )) {
280 // If we don't have a fallback to a straight upload then fail.
281 if (kRequireDraw_DrawPreference == *drawPreference ||
282 !this->caps()->isConfigTexturable(srcConfig)) {
283 return false;
284 }
285 *drawPreference = kNoDraw_DrawPreference;
286 }
287 return true;
288 }
289
290 bool GrGpu::readPixels(GrRenderTarget* target, 235 bool GrGpu::readPixels(GrRenderTarget* target,
291 int left, int top, int width, int height, 236 int left, int top, int width, int height,
292 GrPixelConfig config, void* buffer, 237 GrPixelConfig config, void* buffer,
293 size_t rowBytes) { 238 size_t rowBytes) {
294 this->handleDirtyContext(); 239 this->handleDirtyContext();
295 return this->onReadPixels(target, left, top, width, height, 240 return this->onReadPixels(target, left, top, width, height,
296 config, buffer, rowBytes); 241 config, buffer, rowBytes);
297 } 242 }
298 243
299 bool GrGpu::writeTexturePixels(GrTexture* texture, 244 bool GrGpu::writeTexturePixels(GrTexture* texture,
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 //////////////////////////////////////////////////////////////////////////////// 304 ////////////////////////////////////////////////////////////////////////////////
360 305
361 void GrGpu::draw(const DrawArgs& args, const GrVertices& vertices) { 306 void GrGpu::draw(const DrawArgs& args, const GrVertices& vertices) {
362 this->handleDirtyContext(); 307 this->handleDirtyContext();
363 GrVertices::Iterator iter; 308 GrVertices::Iterator iter;
364 const GrNonInstancedVertices* verts = iter.init(vertices); 309 const GrNonInstancedVertices* verts = iter.init(vertices);
365 do { 310 do {
366 this->onDraw(args, *verts); 311 this->onDraw(args, *verts);
367 } while ((verts = iter.next())); 312 } while ((verts = iter.next()));
368 } 313 }
OLDNEW
« no previous file with comments | « src/gpu/GrGpu.h ('k') | src/gpu/GrTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698