diff options
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkCanvas.h | 4 | ||||
| -rw-r--r-- | include/core/SkVertices.h | 30 |
2 files changed, 10 insertions, 24 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index abac335a0c..90e51e9b0e 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -6,7 +6,7 @@ */ /* Generated by tools/bookmaker from include/core/SkCanvas.h and docs/SkCanvas_Reference.bmh - on 2018-07-03 11:34:22. Additional documentation and examples can be found at: + on 2018-07-02 10:27:08. Additional documentation and examples can be found at: https://skia.org/user/api/SkCanvas_Reference You may edit either file directly. Structural changes to public interfaces require @@ -2156,7 +2156,6 @@ public: The first element of bones should be an object to world space transformation matrix that will be applied before performing mesh deformations. If no such transformation is needed, it should be the identity matrix. - boneCount must be at most 100, and thus the size of bones should be at most 100. @param vertices triangle mesh to draw @param bones bone matrix data @@ -2174,7 +2173,6 @@ public: The first element of bones should be an object to world space transformation matrix that will be applied before performing mesh deformations. If no such transformation is needed, it should be the identity matrix. - boneCount must be at most 100, and thus the size of bones should be at most 100. @param vertices triangle mesh to draw @param bones bone matrix data diff --git a/include/core/SkVertices.h b/include/core/SkVertices.h index 5208bfb442..6c4fb390d0 100644 --- a/include/core/SkVertices.h +++ b/include/core/SkVertices.h @@ -55,16 +55,14 @@ public: const BoneIndices boneIndices[], const BoneWeights boneWeights[], int indexCount, - const uint16_t indices[], - bool isVolatile = true); + const uint16_t indices[]); static sk_sp<SkVertices> MakeCopy(VertexMode mode, int vertexCount, const SkPoint positions[], const SkPoint texs[], const SkColor colors[], const BoneIndices boneIndices[], - const BoneWeights boneWeights[], - bool isVolatile = true) { + const BoneWeights boneWeights[]) { return MakeCopy(mode, vertexCount, positions, @@ -73,8 +71,7 @@ public: boneIndices, boneWeights, 0, - nullptr, - isVolatile); + nullptr); } static sk_sp<SkVertices> MakeCopy(VertexMode mode, int vertexCount, @@ -82,8 +79,7 @@ public: const SkPoint texs[], const SkColor colors[], int indexCount, - const uint16_t indices[], - bool isVolatile = true) { + const uint16_t indices[]) { return MakeCopy(mode, vertexCount, positions, @@ -92,16 +88,14 @@ public: nullptr, nullptr, indexCount, - indices, - isVolatile); + indices); } static sk_sp<SkVertices> MakeCopy(VertexMode mode, int vertexCount, const SkPoint positions[], const SkPoint texs[], - const SkColor colors[], - bool isVolatile = true) { - return MakeCopy(mode, vertexCount, positions, texs, colors, nullptr, nullptr, isVolatile); + const SkColor colors[]) { + return MakeCopy(mode, vertexCount, positions, texs, colors, nullptr, nullptr); } struct Sizes; @@ -110,7 +104,6 @@ public: kHasTexCoords_BuilderFlag = 1 << 0, kHasColors_BuilderFlag = 1 << 1, kHasBones_BuilderFlag = 1 << 2, - kIsVolatile_BuilderFlag = 1 << 3, }; class Builder { public: @@ -121,7 +114,6 @@ public: // if the builder is invalid, these will return 0 int vertexCount() const; int indexCount() const; - bool isVolatile() const; SkPoint* positions(); SkPoint* texCoords(); // returns null if there are no texCoords SkColor* colors(); // returns null if there are no colors @@ -133,9 +125,9 @@ public: sk_sp<SkVertices> detach(); private: - Builder(VertexMode mode, int vertexCount, int indexCount, bool isVolatile, const Sizes&); + Builder(VertexMode mode, int vertexCount, int indexCount, const Sizes&); - void init(VertexMode mode, int vertexCount, int indexCount, bool isVolatile, const Sizes&); + void init(VertexMode mode, int vertexCount, int indexCount, const Sizes&); // holds a partially complete object. only completed in detach() sk_sp<SkVertices> fVertices; @@ -166,8 +158,6 @@ public: int indexCount() const { return fIndexCnt; } const uint16_t* indices() const { return fIndices; } - bool isVolatile() const { return fIsVolatile; } - // returns approximate byte size of the vertices object size_t approximateSize() const; @@ -209,8 +199,6 @@ private: int fVertexCnt; int fIndexCnt; - bool fIsVolatile; - VertexMode fMode; // below here is where the actual array data is stored. }; |