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

Unified Diff: cc/gl_renderer.cc

Issue 11783094: cc: Add point-based UV coordinate on TextureLayer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing danakj comments Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: cc/gl_renderer.cc
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 83827a296b184abc2f360c137e00de636e88e5ae..05f9ac5e16f8cac93fc90e42b3c17cc6a2661d55 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -1085,8 +1085,9 @@ void GLRenderer::enqueueTextureQuad(const DrawingFrame& frame, const TextureDraw
}
// Generate the uv-transform
- const gfx::RectF& uvRect = quad->uv_rect;
- Float4 uv = {uvRect.x(), uvRect.y(), uvRect.width(), uvRect.height()};
+ const gfx::PointF& uv0 = quad->uv_top_left;
+ const gfx::PointF& uv1 = quad->uv_bottom_right;
+ Float4 uv = {uv0.x(), uv0.y(), uv1.x() - uv0.x(), uv1.y() - uv0.y()};
m_drawCache.uv_xform_data.push_back(uv);
// Generate the vertex opacity
@@ -1115,8 +1116,9 @@ void GLRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureDrawQua
binding.set(textureProgram(), context());
setUseProgram(binding.programId);
GLC(context(), context()->uniform1i(binding.samplerLocation, 0));
- const gfx::RectF& uvRect = quad->uv_rect;
- GLC(context(), context()->uniform4f(binding.texTransformLocation, uvRect.x(), uvRect.y(), uvRect.width(), uvRect.height()));
+ const gfx::PointF& uv0 = quad->uv_top_left;
+ const gfx::PointF& uv1 = quad->uv_bottom_right;
+ GLC(context(), context()->uniform4f(binding.texTransformLocation, uv0.x(), uv0.y(), uv1.x() - uv0.x(), uv1.y() - uv0.y()));
GLC(context(), context()->uniform1fv(binding.vertexOpacityLocation, 4, quad->vertex_opacity));

Powered by Google App Engine
This is Rietveld 408576698