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

Unified Diff: cc/CCRendererGL.h

Issue 10984053: cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « cc/CCRenderer.h ('k') | cc/CCRendererGL.cpp » ('j') | cc/math/clamp.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCRendererGL.h
diff --git a/cc/CCRendererGL.h b/cc/CCRendererGL.h
index e7c14eaed79356c2073c6080c063380073bc327b..07c791f1bbca7f6546356e3f62111acc06b03ff9 100644
--- a/cc/CCRendererGL.h
+++ b/cc/CCRendererGL.h
@@ -49,8 +49,6 @@ public:
virtual void viewportChanged() OVERRIDE;
- const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
-
// waits for rendering to finish
virtual void finish() OVERRIDE;
@@ -58,12 +56,7 @@ public:
// puts backbuffer onscreen
virtual bool swapBuffers() OVERRIDE;
- static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line);
-
- const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
-
- virtual void getFramebufferPixels(void *pixels, const IntRect&) OVERRIDE;
- bool getFramebufferTexture(CCScopedTexture*, const IntRect& deviceRect);
+ virtual void getFramebufferPixels(void *pixels, const cc::IntRect&) OVERRIDE;
virtual bool isContextLost() OVERRIDE;
@@ -72,15 +65,21 @@ public:
protected:
CCRendererGL(CCRendererClient*, CCResourceProvider*);
+ static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line);
+
bool isFramebufferDiscarded() const { return m_isFramebufferDiscarded; }
bool initialize();
+ const FloatQuad& sharedGeometryQuad() const { return m_sharedGeometryQuad; }
+ const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }
+
+ bool getFramebufferTexture(CCScopedTexture*, const IntRect& deviceRect);
void releaseRenderPassTextures();
virtual void bindFramebufferToOutputSurface(DrawingFrame&) OVERRIDE;
- virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const IntRect& framebufferRect) OVERRIDE;
- virtual void setDrawViewportSize(const IntSize&) OVERRIDE;
- virtual void enableScissorTestRect(const IntRect& scissorRect) OVERRIDE;
+ virtual bool bindFramebufferToTexture(DrawingFrame&, const CCScopedTexture*, const ccmath::IntRect& framebufferRect) OVERRIDE;
+ virtual void setDrawViewportSize(const ccmath::IntSize&) OVERRIDE;
+ virtual void enableScissorTestRect(const ccmath::IntRect& scissorRect) OVERRIDE;
virtual void disableScissorTest() OVERRIDE;
virtual void clearFramebuffer(DrawingFrame&) OVERRIDE;
virtual void drawQuad(DrawingFrame&, const CCDrawQuad*) OVERRIDE;
@@ -104,11 +103,11 @@ private:
void setShaderOpacity(float opacity, int alphaLocation);
void setShaderFloatQuad(const FloatQuad&, int quadLocation);
- void drawQuadGeometry(const DrawingFrame&, const WebKit::WebTransformationMatrix& drawTransform, const FloatRect& quadRect, int matrixLocation);
+ void drawQuadGeometry(const DrawingFrame&, const WebKit::WebTransformationMatrix& drawTransform, const ccmath::FloatRect& quadRect, int matrixLocation);
- void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const IntRect&, const WebKit::WebTransformationMatrix& drawMatrix);
+ void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const ccmath::IntRect&, const WebKit::WebTransformationMatrix& drawMatrix);
- bool useScopedTexture(DrawingFrame&, const CCScopedTexture*, const IntRect& viewportRect);
+ bool useScopedTexture(DrawingFrame&, const CCScopedTexture*, const ccmath::IntRect& viewportRect);
bool makeContextCurrent();
@@ -209,7 +208,7 @@ private:
WebKit::WebGraphicsContext3D* m_context;
- IntRect m_swapBufferRect;
+ ccmath::IntRect m_swapBufferRect;
bool m_isViewportChanged;
bool m_isFramebufferDiscarded;
bool m_isUsingBindUniform;
« no previous file with comments | « cc/CCRenderer.h ('k') | cc/CCRendererGL.cpp » ('j') | cc/math/clamp.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698