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

Side by Side Diff: cc/software_renderer.cc

Issue 11366199: Avoid redundantly setting tex parameters (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removes now-dead textureFilter code, tests that we don't call texParameteri during draw Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « cc/resource_provider.cc ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/software_renderer.h" 5 #include "cc/software_renderer.h"
6 6
7 #include "cc/debug_border_draw_quad.h" 7 #include "cc/debug_border_draw_quad.h"
8 #include "cc/render_pass_draw_quad.h" 8 #include "cc/render_pass_draw_quad.h"
9 #include "cc/solid_color_draw_quad.h" 9 #include "cc/solid_color_draw_quad.h"
10 #include "cc/texture_draw_quad.h" 10 #include "cc/texture_draw_quad.h"
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 } 258 }
259 259
260 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQua d* quad) 260 void SoftwareRenderer::drawTileQuad(const DrawingFrame& frame, const TileDrawQua d* quad)
261 { 261 {
262 DCHECK(isSoftwareResource(quad->resourceId())); 262 DCHECK(isSoftwareResource(quad->resourceId()));
263 ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, quad->reso urceId()); 263 ResourceProvider::ScopedReadLockSoftware lock(m_resourceProvider, quad->reso urceId());
264 264
265 SkRect uvRect = SkRect::MakeXYWH( 265 SkRect uvRect = SkRect::MakeXYWH(
266 quad->textureOffset().x(), quad->textureOffset().y(), 266 quad->textureOffset().x(), quad->textureOffset().y(),
267 quad->quadRect().width(), quad->quadRect().height()); 267 quad->quadRect().width(), quad->quadRect().height());
268 if (quad->textureFilter() != GL_NEAREST) 268 m_skCurrentPaint.setFilterBitmap(true);
269 m_skCurrentPaint.setFilterBitmap(true);
270 m_skCurrentCanvas->drawBitmapRectToRect(*lock.skBitmap(), &uvRect, 269 m_skCurrentCanvas->drawBitmapRectToRect(*lock.skBitmap(), &uvRect,
271 toSkRect(quadVertexRect()), 270 toSkRect(quadVertexRect()),
272 &m_skCurrentPaint); 271 &m_skCurrentPaint);
273 } 272 }
274 273
275 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende rPassDrawQuad* quad) 274 void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende rPassDrawQuad* quad)
276 { 275 {
277 CachedResource* contentTexture = m_renderPassTextures.get(quad->renderPassId ()); 276 CachedResource* contentTexture = m_renderPassTextures.get(quad->renderPassId ());
278 if (!contentTexture || !contentTexture->id()) 277 if (!contentTexture || !contentTexture->id())
279 return; 278 return;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 } 354 }
356 355
357 void SoftwareRenderer::setVisible(bool visible) 356 void SoftwareRenderer::setVisible(bool visible)
358 { 357 {
359 if (m_visible == visible) 358 if (m_visible == visible)
360 return; 359 return;
361 m_visible = visible; 360 m_visible = visible;
362 } 361 }
363 362
364 } // namespace cc 363 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resource_provider.cc ('k') | cc/software_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698