Re-land: cc: Added antialiasing support for solid color layers

cc/gl_renderer.h

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_GL_RENDERER_H_
 #define CC_GL_RENDERER_H_
 
 #include "cc/cc_export.h"
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 99 matching lines @@
     void drawYUVVideoQuad(const DrawingFrame&, const YUVVideoDrawQuad*);
 
     void setShaderOpacity(float opacity, int alphaLocation);
     void setShaderQuadF(const gfx::QuadF&, int quadLocation);
     void drawQuadGeometry(const DrawingFrame&, const gfx::Transform& drawTransform, const gfx::RectF& quadRect, int matrixLocation);
     void setBlendEnabled(bool enabled);
     void setUseProgram(unsigned program);
 
     void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const gfx::Transform& drawMatrix);
 
+    // Check if quad needs antialiasing and if so, inflate the quad and fill edge array for fragment shader.
+    // localQuad is set to inflated quad if antialiasing is required, otherwise it is set to the original quad.
+    // edge array is filled with inflated quad's edge data if antialiasing is required, otherwise it is left unchanged.
+    // Returns true if quad requires antialiasing and false otherwise.
+    bool setupQuadForAntialiasing(const gfx::Transform& deviceTransform, const DrawQuad* quad, gfx::QuadF* localQuad, float* edge) const;

[reveman, 2013/03/04 20:28:30]

Lets have this only modify input parameters when quad needs anti-aliasing. I
think that might be a bit cleaner and it's the behavior I would expect if I
didn't read your comment above.

[ernstm, 2013/03/04 22:00:26]

Done.

+
     bool useScopedTexture(DrawingFrame&, const ScopedResource*, const gfx::Rect& viewportRect);
 
     bool makeContextCurrent();
 
     bool initializeSharedObjects();
     void cleanupSharedObjects();
 
     // WebKit::WebGraphicsContext3D::WebGraphicsSwapBuffersCompleteCallbackCHROMIUM implementation.
     virtual void onSwapBuffersComplete() OVERRIDE;
 
@@ skipping 33 matching lines @@
     // Texture shaders.
     typedef ProgramBinding<VertexShaderPosTexTransform, FragmentShaderRGBATexVaryingAlpha> TextureProgram;
     typedef ProgramBinding<VertexShaderPosTexTransformFlip, FragmentShaderRGBATexVaryingAlpha> TextureProgramFlip;
     typedef ProgramBinding<VertexShaderPosTexTransform, FragmentShaderRGBATexRectVaryingAlpha> TextureIOSurfaceProgram;
 
     // Video shaders.
     typedef ProgramBinding<VertexShaderVideoTransform, FragmentShaderOESImageExternal> VideoStreamTextureProgram;
     typedef ProgramBinding<VertexShaderPosTexYUVStretch, FragmentShaderYUVVideo> VideoYUVProgram;
 
     // Special purpose / effects shaders.
-    typedef ProgramBinding<VertexShaderPos, FragmentShaderColor> SolidColorProgram;
+    typedef ProgramBinding<VertexShaderQuad, FragmentShaderColor> SolidColorProgram;
+    typedef ProgramBinding<VertexShaderQuad, FragmentShaderColorAA> SolidColorProgramAA;
 
     const TileProgram* tileProgram();
     const TileProgramOpaque* tileProgramOpaque();
     const TileProgramAA* tileProgramAA();
     const TileProgramSwizzle* tileProgramSwizzle();
     const TileProgramSwizzleOpaque* tileProgramSwizzleOpaque();
     const TileProgramSwizzleAA* tileProgramSwizzleAA();
     const TileCheckerboardProgram* tileCheckerboardProgram();
 
     const RenderPassProgram* renderPassProgram();
     const RenderPassProgramAA* renderPassProgramAA();
     const RenderPassMaskProgram* renderPassMaskProgram();
     const RenderPassMaskProgramAA* renderPassMaskProgramAA();
 
     const TextureProgram* textureProgram();
     const TextureProgramFlip* textureProgramFlip();
     const TextureIOSurfaceProgram* textureIOSurfaceProgram();
 
     const VideoYUVProgram* videoYUVProgram();
     const VideoStreamTextureProgram* videoStreamTextureProgram();
 
     const SolidColorProgram* solidColorProgram();
+    const SolidColorProgramAA* solidColorProgramAA();
 
     scoped_ptr<TileProgram> m_tileProgram;
     scoped_ptr<TileProgramOpaque> m_tileProgramOpaque;
     scoped_ptr<TileProgramAA> m_tileProgramAA;
     scoped_ptr<TileProgramSwizzle> m_tileProgramSwizzle;
     scoped_ptr<TileProgramSwizzleOpaque> m_tileProgramSwizzleOpaque;
     scoped_ptr<TileProgramSwizzleAA> m_tileProgramSwizzleAA;
     scoped_ptr<TileCheckerboardProgram> m_tileCheckerboardProgram;
 
     scoped_ptr<RenderPassProgram> m_renderPassProgram;
     scoped_ptr<RenderPassProgramAA> m_renderPassProgramAA;
     scoped_ptr<RenderPassMaskProgram> m_renderPassMaskProgram;
     scoped_ptr<RenderPassMaskProgramAA> m_renderPassMaskProgramAA;
 
     scoped_ptr<TextureProgram> m_textureProgram;
     scoped_ptr<TextureProgramFlip> m_textureProgramFlip;
     scoped_ptr<TextureIOSurfaceProgram> m_textureIOSurfaceProgram;
 
     scoped_ptr<VideoYUVProgram> m_videoYUVProgram;
     scoped_ptr<VideoStreamTextureProgram> m_videoStreamTextureProgram;
 
     scoped_ptr<SolidColorProgram> m_solidColorProgram;
+    scoped_ptr<SolidColorProgramAA> m_solidColorProgramAA;
 
     OutputSurface* m_outputSurface;
     WebKit::WebGraphicsContext3D* m_context;
 
     gfx::Rect m_swapBufferRect;
     gfx::Rect m_scissorRect;
     bool m_isViewportChanged;
     bool m_isBackbufferDiscarded;
     bool m_discardBackbufferWhenNotVisible;
     bool m_isUsingBindUniform;
@@ skipping 19 matching lines @@
 #if DEBUG_GL_CALLS && !defined(NDEBUG)
 #define GLC(context, x) (x, GLRenderer::debugGLCall(&*context, #x, __FILE__, __LINE__))
 #else
 #define GLC(context, x) (x)
 #endif
 
 
 }
 
 #endif  // CC_GL_RENDERER_H_