From 3f84483382be2d528918cc1a6fbc6a7d68e0b181 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Wed, 7 Aug 2013 21:24:32 -0700 Subject: SurfaceFlinger now uses GLES 2.x when available Bug: 8679321 Change-Id: I2b152d01fb4e2de2ea9fe87f1ddbd6826d7520d7 --- services/surfaceflinger/RenderEngine/GLES11RenderEngine.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'services/surfaceflinger/RenderEngine/GLES11RenderEngine.h') diff --git a/services/surfaceflinger/RenderEngine/GLES11RenderEngine.h b/services/surfaceflinger/RenderEngine/GLES11RenderEngine.h index 15054bd..8bb7ed1 100644 --- a/services/surfaceflinger/RenderEngine/GLES11RenderEngine.h +++ b/services/surfaceflinger/RenderEngine/GLES11RenderEngine.h @@ -30,6 +30,7 @@ namespace android { // --------------------------------------------------------------------------- class String8; +class Mesh; class GLES11RenderEngine : public RenderEngine { GLuint mProtectedTexName; @@ -43,7 +44,7 @@ protected: virtual ~GLES11RenderEngine(); virtual void dump(String8& result); - virtual void setViewportAndProjection(size_t w, size_t h); + virtual void setViewportAndProjection(size_t vpw, size_t vph, size_t w, size_t h, bool yswap); virtual void setupLayerBlending(bool premultipliedAlpha, bool opaque, int alpha); virtual void setupDimLayerBlending(int alpha); virtual void setupLayerTexturing(size_t textureName, bool useFiltering, const float* textureMatrix); @@ -51,10 +52,8 @@ protected: virtual void disableTexturing(); virtual void disableBlending(); - virtual void clearWithColor(const float vertices[][2], size_t count, - float red, float green, float blue, float alpha); - - virtual void drawMesh2D(const float vertices[][2], const float texCoords[][2], size_t count); + virtual void fillWithColor(const Mesh& mesh, float r, float g, float b, float a) ; + virtual void drawMesh(const Mesh& mesh); virtual size_t getMaxTextureSize() const; virtual size_t getMaxViewportDims() const; -- cgit v1.1