| Index: cc/gl_renderer.h
|
| diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h
|
| index c2cb9ce5c8c72cb31fe287951265aab7e976901f..ceae34cc9c82685366ba73bd7ecdfe1731caedeb 100644
|
| --- a/cc/gl_renderer.h
|
| +++ b/cc/gl_renderer.h
|
| @@ -17,6 +17,7 @@
|
| #include "cc/solid_color_draw_quad.h"
|
| #include "cc/tile_draw_quad.h"
|
| #include "cc/yuv_video_draw_quad.h"
|
| +#include "cc/yuva_video_draw_quad.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsMemoryAllocation.h"
|
| #include "ui/gfx/quad_f.h"
|
| @@ -106,6 +107,7 @@ private:
|
| void drawIOSurfaceQuad(const DrawingFrame&, const IOSurfaceDrawQuad*);
|
| void drawTileQuad(const DrawingFrame&, const TileDrawQuad*);
|
| void drawYUVVideoQuad(const DrawingFrame&, const YUVVideoDrawQuad*);
|
| + void drawYUVAVideoQuad(const DrawingFrame&, const YUVAVideoDrawQuad*);
|
|
|
| void setShaderOpacity(float opacity, int alphaLocation);
|
| void setShaderQuadF(const gfx::QuadF&, int quadLocation);
|
| @@ -166,6 +168,7 @@ private:
|
| // Video shaders.
|
| typedef ProgramBinding<VertexShaderVideoTransform, FragmentShaderOESImageExternal> VideoStreamTextureProgram;
|
| typedef ProgramBinding<VertexShaderPosTexYUVStretch, FragmentShaderYUVVideo> VideoYUVProgram;
|
| + typedef ProgramBinding<VertexShaderPosTexYUVStretch, FragmentShaderYUVAVideo> VideoYUVAProgram;
|
|
|
| // Special purpose / effects shaders.
|
| typedef ProgramBinding<VertexShaderPos, FragmentShaderColor> SolidColorProgram;
|
| @@ -188,6 +191,7 @@ private:
|
| const TextureIOSurfaceProgram* textureIOSurfaceProgram();
|
|
|
| const VideoYUVProgram* videoYUVProgram();
|
| + const VideoYUVAProgram* videoYUVAProgram();
|
| const VideoStreamTextureProgram* videoStreamTextureProgram();
|
|
|
| const SolidColorProgram* solidColorProgram();
|
| @@ -210,6 +214,7 @@ private:
|
| scoped_ptr<TextureIOSurfaceProgram> m_textureIOSurfaceProgram;
|
|
|
| scoped_ptr<VideoYUVProgram> m_videoYUVProgram;
|
| + scoped_ptr<VideoYUVAProgram> m_videoYUVAProgram;
|
| scoped_ptr<VideoStreamTextureProgram> m_videoStreamTextureProgram;
|
|
|
| scoped_ptr<SolidColorProgram> m_solidColorProgram;
|
|
|