diff options
| -rw-r--r-- | libs/hwui/SkiaCanvas.cpp | 39 | ||||
| -rw-r--r-- | libs/hwui/SkiaCanvasProxy.cpp | 17 | ||||
| -rw-r--r-- | libs/hwui/SkiaCanvasProxy.h | 5 | ||||
| -rw-r--r-- | libs/hwui/tests/unit/FatalTestCanvas.h | 4 |
4 files changed, 27 insertions, 38 deletions
diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp index 812e4d885b39..daf14af87288 100644 --- a/libs/hwui/SkiaCanvas.cpp +++ b/libs/hwui/SkiaCanvas.cpp @@ -522,8 +522,10 @@ void SkiaCanvas::drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount, SkDEBUGFAIL("SkScalar must be a float for these conversions to be valid"); #endif const int ptCount = vertexCount >> 1; - mCanvas->drawVertices(vertexMode, ptCount, (SkPoint*)verts, (SkPoint*)texs, - (SkColor*)colors, indices, indexCount, paint); + mCanvas->drawVertices(SkVertices::MakeCopy(vertexMode, ptCount, (SkPoint*)verts, + (SkPoint*)texs, (SkColor*)colors, + indexCount, indices), + SkBlendMode::kModulate, paint); } // ---------------------------------------------------------------------------- @@ -560,23 +562,17 @@ void SkiaCanvas::drawBitmapMesh(Bitmap& hwuiBitmap, int meshWidth, int meshHeigh hwuiBitmap.getSkBitmap(&bitmap); const int ptCount = (meshWidth + 1) * (meshHeight + 1); const int indexCount = meshWidth * meshHeight * 6; - - /* Our temp storage holds 2 or 3 arrays. - texture points [ptCount * sizeof(SkPoint)] - optionally vertex points [ptCount * sizeof(SkPoint)] if we need a - copy to convert from float to fixed - indices [ptCount * sizeof(uint16_t)] - */ - ssize_t storageSize = ptCount * sizeof(SkPoint); // texs[] - storageSize += indexCount * sizeof(uint16_t); // indices[] - - -#ifndef SK_SCALAR_IS_FLOAT - SkDEBUGFAIL("SkScalar must be a float for these conversions to be valid"); -#endif - std::unique_ptr<char[]> storage(new char[storageSize]); - SkPoint* texs = (SkPoint*)storage.get(); - uint16_t* indices = (uint16_t*)(texs + ptCount); + uint32_t flags = SkVertices::kHasTexCoords_BuilderFlag; + if (colors) { + flags |= SkVertices::kHasColors_BuilderFlag; + } + SkVertices::Builder builder(SkCanvas::kTriangles_VertexMode, ptCount, indexCount, flags); + memcpy(builder.positions(), vertices, ptCount * sizeof(SkPoint)); + if (colors) { + memcpy(builder.colors(), colors, ptCount * sizeof(SkColor)); + } + SkPoint* texs = builder.texCoords(); + uint16_t* indices = builder.indices(); // cons up texture coordinates and indices { @@ -625,7 +621,6 @@ void SkiaCanvas::drawBitmapMesh(Bitmap& hwuiBitmap, int meshWidth, int meshHeigh index += 1; } SkASSERT(indexPtr - indices == indexCount); - SkASSERT((char*)indexPtr - (char*)storage.get() == storageSize); } // double-check that we have legal indices @@ -646,9 +641,7 @@ void SkiaCanvas::drawBitmapMesh(Bitmap& hwuiBitmap, int meshWidth, int meshHeigh sk_sp<SkImage> image = SkMakeImageFromRasterBitmap(bitmap, kNever_SkCopyPixelsMode); tmpPaint.setShader(image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode)); - mCanvas->drawVertices(SkCanvas::kTriangles_VertexMode, ptCount, (SkPoint*)vertices, - texs, (const SkColor*)colors, indices, - indexCount, tmpPaint); + mCanvas->drawVertices(builder.detach(), SkBlendMode::kModulate, tmpPaint); } void SkiaCanvas::drawNinePatch(Bitmap& hwuiBitmap, const Res_png_9patch& chunk, diff --git a/libs/hwui/SkiaCanvasProxy.cpp b/libs/hwui/SkiaCanvasProxy.cpp index 20ca80b95465..f6e92dca2bb9 100644 --- a/libs/hwui/SkiaCanvasProxy.cpp +++ b/libs/hwui/SkiaCanvasProxy.cpp @@ -31,6 +31,7 @@ #include <SkRSXform.h> #include <SkSurface.h> #include <SkTextBlobRunIterator.h> +#include <SkVertices.h> namespace android { namespace uirenderer { @@ -180,20 +181,20 @@ void SkiaCanvasProxy::onDrawImageLattice(const SkImage* image, const Lattice& la } } -void SkiaCanvasProxy::onDrawVertices(VertexMode mode, int vertexCount, const SkPoint vertices[], - const SkPoint texs[], const SkColor colors[], SkBlendMode, const uint16_t indices[], - int indexCount, const SkPaint& paint) { +void SkiaCanvasProxy::onDrawVerticesObject(const SkVertices* vertices, SkBlendMode bmode, + const SkPaint& paint) { // TODO: should we pass through blendmode if (mFilterHwuiCalls) { return; } // convert the SkPoints into floats static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats"); - const int floatCount = vertexCount << 1; - const float* vArray = &vertices[0].fX; - const float* tArray = (texs) ? &texs[0].fX : NULL; - const int* cArray = (colors) ? (int*)colors : NULL; - mCanvas->drawVertices(mode, floatCount, vArray, tArray, cArray, indices, indexCount, paint); + const int floatCount = vertices->vertexCount() << 1; + const float* vArray = (const float*)vertices->positions(); + const float* tArray = (const float*)vertices->texCoords(); + const int* cArray = (const int*)vertices->colors(); + mCanvas->drawVertices(vertices->mode(), floatCount, vArray, tArray, cArray, + vertices->indices(), vertices->indexCount(), paint); } sk_sp<SkSurface> SkiaCanvasProxy::onNewSurface(const SkImageInfo&, const SkSurfaceProps&) { diff --git a/libs/hwui/SkiaCanvasProxy.h b/libs/hwui/SkiaCanvasProxy.h index 3b1dd7383f36..d11a779b3600 100644 --- a/libs/hwui/SkiaCanvasProxy.h +++ b/libs/hwui/SkiaCanvasProxy.h @@ -75,10 +75,7 @@ protected: const SkPaint*); virtual void onDrawImageLattice(const SkImage*, const Lattice& lattice, const SkRect& dst, const SkPaint*); - virtual void onDrawVertices(VertexMode, int vertexCount, const SkPoint vertices[], - const SkPoint texs[], const SkColor colors[], SkBlendMode, - const uint16_t indices[], int indexCount, - const SkPaint&) override; + virtual void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&) override; virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) override; diff --git a/libs/hwui/tests/unit/FatalTestCanvas.h b/libs/hwui/tests/unit/FatalTestCanvas.h index 4831722b93e6..03d94964ac76 100644 --- a/libs/hwui/tests/unit/FatalTestCanvas.h +++ b/libs/hwui/tests/unit/FatalTestCanvas.h @@ -80,9 +80,7 @@ public: void onDrawPoints(PointMode, size_t count, const SkPoint pts[], const SkPaint&) { ADD_FAILURE() << "onDrawPoints not expected in this test"; } - void onDrawVertices(VertexMode, int vertexCount, const SkPoint vertices[], const SkPoint texs[], - const SkColor colors[], SkBlendMode, const uint16_t indices[], int indexCount, - const SkPaint&) { + void onDrawVerticesObject(const SkVertices*, SkBlendMode, const SkPaint&) { ADD_FAILURE() << "onDrawVertices not expected in this test"; } void onDrawAtlas(const SkImage*, const SkRSXform[], const SkRect[], const SkColor[], int count, |