Adding support for per vertex opacity on textured layer

cc/gl_renderer.cc

Index: cc/gl_renderer.cc
diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
index 384e443ef2d7b64282fdcf0d635691c6ed12b842..1de1614a17d6c0120dd3cf2c2dc6c38d92389364 100644
--- a/cc/gl_renderer.cc
+++ b/cc/gl_renderer.cc
@@ -969,8 +969,10 @@ struct TexTransformTextureProgramBinding : TextureProgramBinding {
     {
         TextureProgramBinding::set(program, context);
         texTransformLocation = program->vertexShader().texTransformLocation();
+        vertexOpacityLocation = program->vertexShader().vertexOpacityLocation();
     }
     int texTransformLocation;
+    int vertexOpacityLocation;
 };
 
 void GLRenderer::flushTextureQuadCache()
@@ -1002,15 +1004,13 @@ void GLRenderer::flushTextureQuadCache()
         GLC(context(), context()->blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ZERO, GL_ONE));
     }
 
-    // Set the shader opacity.
-    setShaderOpacity(m_drawCache.alpha, m_drawCache.alpha_location);
-
     COMPILE_ASSERT(sizeof(Float4) == 4 * sizeof(float), struct_is_densely_packed);
     COMPILE_ASSERT(sizeof(Float16) == 16 * sizeof(float), struct_is_densely_packed);
 
     // Upload the tranforms for both points and uvs.
     GLC(m_context, m_context->uniformMatrix4fv((int)m_drawCache.matrix_location, (int)m_drawCache.matrix_data.size(), false, (float*)&m_drawCache.matrix_data.front()));
     GLC(m_context, m_context->uniform4fv((int)m_drawCache.uv_xform_location, (int)m_drawCache.uv_xform_data.size(), (float*)&m_drawCache.uv_xform_data.front()));
+    GLC(m_context, m_context->uniform1fv((int)m_drawCache.vertex_opacity_location, (int)m_drawCache.vertex_opacity_data.size(), (float*)&m_drawCache.vertex_opacity_data.front()));

[jamesr, 2012/12/14 21:18:20]

chromium style prefers C++ style casts (static_cast<> and family) to C-style
casts, although i'm noticing now that the previous lines are also doing C-style
casts :(. mind changing the new ones to all be static_cast<>() ?

[Jerome, 2012/12/14 21:48:47]

Done.

 
     // Draw the quads!
     GLC(m_context, m_context->drawElements(GL_TRIANGLES, 6 * m_drawCache.matrix_data.size(), GL_UNSIGNED_SHORT, 0));
@@ -1022,12 +1022,13 @@ void GLRenderer::flushTextureQuadCache()
     // Clear the cache.
     m_drawCache.program_id = 0;
     m_drawCache.uv_xform_data.resize(0);
+    m_drawCache.vertex_opacity_data.resize(0);
     m_drawCache.matrix_data.resize(0);
 }
 
 void GLRenderer::enqueueTextureQuad(const DrawingFrame& frame, const TextureDrawQuad* quad)
 {
-    // Choose the correcte texture program binding
+    // Choose the correct texture program binding
     TexTransformTextureProgramBinding binding;
     if (quad->flipped)
         binding.set(textureProgramFlip(), context());
@@ -1038,19 +1039,17 @@ void GLRenderer::enqueueTextureQuad(const DrawingFrame& frame, const TextureDraw
 
     if (m_drawCache.program_id != binding.programId ||
         m_drawCache.resource_id != resourceID ||
-        m_drawCache.alpha != quad->opacity() ||
         m_drawCache.use_premultiplied_alpha != quad->premultiplied_alpha ||
         m_drawCache.needs_blending != quad->ShouldDrawWithBlending() ||
         m_drawCache.matrix_data.size() >= 8) {
         flushTextureQuadCache();
         m_drawCache.program_id = binding.programId;
         m_drawCache.resource_id = resourceID;
-        m_drawCache.alpha = quad->opacity();
         m_drawCache.use_premultiplied_alpha = quad->premultiplied_alpha;
         m_drawCache.needs_blending = quad->ShouldDrawWithBlending();
 
-        m_drawCache.alpha_location = binding.alphaLocation;
         m_drawCache.uv_xform_location = binding.texTransformLocation;
+        m_drawCache.vertex_opacity_location = binding.vertexOpacityLocation;
         m_drawCache.matrix_location = binding.matrixLocation;
     }
 
@@ -1059,6 +1058,13 @@ void GLRenderer::enqueueTextureQuad(const DrawingFrame& frame, const TextureDraw
     Float4 uv = {uvRect.x(), uvRect.y(), uvRect.width(), uvRect.height()};
     m_drawCache.uv_xform_data.push_back(uv);
 
+    // Generate the vertex opacity
+    const float opacity = quad->opacity();
+    m_drawCache.vertex_opacity_data.push_back(quad->vertex_opacity[0] * opacity);
+    m_drawCache.vertex_opacity_data.push_back(quad->vertex_opacity[1] * opacity);
+    m_drawCache.vertex_opacity_data.push_back(quad->vertex_opacity[2] * opacity);
+    m_drawCache.vertex_opacity_data.push_back(quad->vertex_opacity[3] * opacity);
+
     // Generate the transform matrix
     gfx::Transform quadRectMatrix;
     quadRectTransform(&quadRectMatrix, quad->quadTransform(), quad->rect);
@@ -1081,6 +1087,8 @@ void GLRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureDrawQua
     const gfx::RectF& uvRect = quad->uv_rect;
     GLC(context(), context()->uniform4f(binding.texTransformLocation, uvRect.x(), uvRect.y(), uvRect.width(), uvRect.height()));
 
+    GLC(context(), context()->uniform4fv(binding.vertexOpacityLocation, 1, quad->vertex_opacity));
+
     ResourceProvider::ScopedSamplerGL quadResourceLock(m_resourceProvider, quad->resource_id, GL_TEXTURE_2D, GL_LINEAR);
 
     if (!quad->premultiplied_alpha) {
@@ -1095,7 +1103,6 @@ void GLRenderer::drawTextureQuad(const DrawingFrame& frame, const TextureDrawQua
         GLC(context(), context()->blendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ZERO, GL_ONE));
     }
 
-    setShaderOpacity(quad->opacity(), binding.alphaLocation);
     drawQuadGeometry(frame, quad->quadTransform(), quad->rect, binding.matrixLocation);
 
     if (!quad->premultiplied_alpha)
@@ -1114,9 +1121,11 @@ void GLRenderer::drawIOSurfaceQuad(const DrawingFrame& frame, const IOSurfaceDra
     else
         GLC(context(), context()->uniform4f(binding.texTransformLocation, 0, 0, quad->io_surface_size.width(), quad->io_surface_size.height()));
 

[whunt, 2012/12/14 21:13:45]

You're using uniform4f to bind to a float array (which *might* work but I
believe is technically incorrect)
this should be something like:

float opacity[4] = {quad->opacity(), quad->opacity(), quad->opacity(),
quad->opacity()};
GLC(context(), context()->uniform1fv(binding.vertexOpacityLocation, opacity);

[Jerome, 2012/12/14 21:48:47]

Done.

+    const float opacity = quad->opacity();
+    GLC(context(), context()->uniform4f(binding.vertexOpacityLocation, opacity, opacity, opacity, opacity));
+
     GLC(context(), context()->bindTexture(GL_TEXTURE_RECTANGLE_ARB, quad->io_surface_texture_id));
 
-    setShaderOpacity(quad->opacity(), binding.alphaLocation);
     drawQuadGeometry(frame, quad->quadTransform(), quad->rect, binding.matrixLocation);
 
     GLC(context(), context()->bindTexture(GL_TEXTURE_RECTANGLE_ARB, 0));