AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove some uses of direct fPtr access in VertexWriter.

Browse Source 
Ideally we could move fPtr on VertexWriter to be private to force all
users of VertexWriter to go through the write functions. This CL at
least removes all users that were using fPtr for validity checking of
the VertexWriter.

I also move fPtr to private and added a temporary public getter. This
will allow us to make a base Writer class where fPtr is private and
we'll only expose the getter on the VertexWriter.

Change-Id: Ib389778d0f530fb31cef85460f00bd9f687c5219
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/463456
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: Greg Daniel <egdaniel@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Greg Daniel 2021-10-25 22:32:34 -04:00 committed by SkCQ
parent ef8907c69f
commit 4427d1eebf
12 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gpu/VertexWriter.h
View File

@ -26,8 +26,6 @@ namespace skgpu {
struct VertexWriter {
inline constexpr static uint32_t kIEEE_32_infinity = 0x7f800000;
void* fPtr;
VertexWriter() = default;
VertexWriter(void* ptr) : fPtr(ptr) {}
VertexWriter(const VertexWriter&) = delete;
@ -43,6 +41,11 @@ struct VertexWriter {
bool operator==(const VertexWriter& that) const { return fPtr == that.fPtr; }
operator bool() const { return fPtr != nullptr; }
// TODO: Remove this call. We want all users of VertexWriter to have to go through the vertex
// writer functions to write data. We do not want them to directly access fPtr and copy their
// own data.
void* ptr() const { return fPtr; }
VertexWriter makeOffset(ptrdiff_t offsetInBytes) const {
return {SkTAddOffset<void>(fPtr, offsetInBytes)};
}
@ -162,12 +165,14 @@ private:
template <int kCornerIdx>
void writeQuadVertex() {}
void* fPtr;
};
template <typename T>
inline VertexWriter& operator<<(VertexWriter& w, const T& val) {
static_assert(std::is_pod<T>::value, "");
memcpy(w.fPtr, &val, sizeof(T));
memcpy(w.ptr(), &val, sizeof(T));
w = w.makeOffset(sizeof(T));
return w;
}
@ -189,7 +194,7 @@ inline VertexWriter& operator<<(VertexWriter& w, const VertexWriter::Skip<T>& va
template <>
SK_MAYBE_UNUSED inline VertexWriter& operator<<(VertexWriter& w, const Sk4f& vector) {
vector.store(w.fPtr);
vector.store(w.ptr());
w = w.makeOffset(sizeof(vector));
return w;
}

2
src/gpu/geometry/GrTriangulator.cpp
View File

@ -88,7 +88,7 @@ static inline void* emit_vertex(Vertex* v, bool emitCoverage, void* data) {
verts << GrNormalizeByteToFloat(v->fAlpha);
}
return verts.fPtr;
return verts.ptr();
}
static void* emit_triangle(Vertex* v0, Vertex* v1, Vertex* v2, bool emitCoverage, void* data) {

2
src/gpu/ops/AAConvexPathRenderer.cpp
View File

@ -807,7 +807,7 @@ private:
&vertexBuffer,
&firstVertex)};
if (!verts.fPtr) {
if (!verts) {
SkDebugf("Could not allocate vertices\n");
return;
}

2
src/gpu/ops/DashOp.cpp
View File

@ -564,7 +564,7 @@ private:
QuadHelper helper(target, fProgramInfo->geomProc().vertexStride(), totalRectCount);
VertexWriter vertices{ helper.vertices() };
if (!vertices.fPtr) {
if (!vertices) {
return;
}

4
src/gpu/ops/DrawVerticesOp.cpp
View File

@ -405,7 +405,7 @@ void DrawVerticesOpImpl::onPrepareDraws(GrMeshDrawTarget* target) {
int firstVertex = 0;
VertexWriter verts{
target->makeVertexSpace(vertexStride, fVertexCount, &vertexBuffer, &firstVertex)};
if (!verts.fPtr) {
if (!verts) {
SkDebugf("Could not allocate vertices\n");
return;
}
@ -446,7 +446,7 @@ void DrawVerticesOpImpl::onPrepareDraws(GrMeshDrawTarget* target) {
// TODO4F: Preserve float colors
GrColor meshColor = mesh.fColor.toBytes_RGBA();
SkPoint* posBase = (SkPoint*)verts.fPtr;
SkPoint* posBase = (SkPoint*)verts.ptr();
for (int i = 0; i < vertexCount; ++i) {
verts << positions[i];

12
src/gpu/ops/GrOvalOpFactory.cpp
View File

@ -1281,7 +1281,7 @@ private:
int firstVertex;
VertexWriter vertices{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
fVertCount, &vertexBuffer, &firstVertex)};
if (!vertices.fPtr) {
if (!vertices) {
SkDebugf("Could not allocate vertices\n");
return;
}
@ -1653,7 +1653,7 @@ private:
int firstVertex;
VertexWriter vertices{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
fVertCount, &vertexBuffer, &firstVertex)};
if (!vertices.fPtr) {
if (!vertices) {
SkDebugf("Could not allocate vertices\n");
return;
}
@ -1987,7 +1987,7 @@ private:
QuadHelper helper(target, fProgramInfo->geomProc().vertexStride(), fEllipses.count());
VertexWriter verts{helper.vertices()};
if (!verts.fPtr) {
if (!verts) {
SkDebugf("Could not allocate vertices\n");
return;
}
@ -2263,7 +2263,7 @@ private:
QuadHelper helper(target, fProgramInfo->geomProc().vertexStride(), fEllipses.count());
VertexWriter verts{helper.vertices()};
if (!verts.fPtr) {
if (!verts) {
return;
}
@ -2684,7 +2684,7 @@ private:
VertexWriter verts{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
fVertCount, &vertexBuffer, &firstVertex)};
if (!verts.fPtr) {
if (!verts) {
SkDebugf("Could not allocate vertices\n");
return;
}
@ -3014,7 +3014,7 @@ private:
std::move(indexBuffer), kVertsPerStandardRRect, indicesPerInstance,
fRRects.count(), kNumRRectsInIndexBuffer);
VertexWriter verts{helper.vertices()};
if (!verts.fPtr) {
if (!verts) {
SkDebugf("Could not allocate vertices\n");
return;
}

2
src/gpu/ops/LatticeOp.cpp
View File

@ -250,7 +250,7 @@ private:
QuadHelper helper(target, kVertexStride, numRects);
VertexWriter vertices{helper.vertices()};
if (!vertices.fPtr) {
if (!vertices) {
SkDebugf("Could not allocate vertices\n");
return;
}

2
src/gpu/ops/QuadPerEdgeAA.cpp
View File

@ -368,7 +368,7 @@ void Tessellator::append(GrQuad* deviceQuad, GrQuad* localQuad,
const SkPMColor4f& color, const SkRect& uvSubset, GrQuadAAFlags aaFlags) {
// We allow Tessellator to be created with a null vertices pointer for convenience, but it is
// assumed it will never actually be used in those cases.
SkASSERT(fVertexWriter.fPtr);
SkASSERT(fVertexWriter);
SkASSERT(deviceQuad->quadType() <= fVertexSpec.deviceQuadType());
SkASSERT(localQuad || !fVertexSpec.hasLocalCoords());
SkASSERT(!fVertexSpec.hasLocalCoords() || localQuad->quadType() <= fVertexSpec.localQuadType());

2
src/gpu/ops/QuadPerEdgeAA.h
View File

@ -146,7 +146,7 @@ namespace skgpu::v1::QuadPerEdgeAA {
void append(GrQuad* deviceQuad, GrQuad* localQuad,
const SkPMColor4f& color, const SkRect& uvSubset, GrQuadAAFlags aaFlags);
SkDEBUGCODE(char* vertices() const { return (char*) fVertexWriter.fPtr; })
SkDEBUGCODE(char* vertices() const { return (char*) fVertexWriter.ptr(); })
private:
// VertexSpec defines many unique ways to write vertex attributes, which can be handled

2
src/gpu/ops/RegionOp.cpp
View File

@ -125,7 +125,7 @@ private:
QuadHelper helper(target, fProgramInfo->geomProc().vertexStride(), numRects);
VertexWriter vertices{helper.vertices()};
if (!vertices.fPtr) {
if (!vertices) {
SkDebugf("Could not allocate vertices\n");
return;
}

2
src/gpu/ops/SmallPathRenderer.cpp
View File

@ -216,7 +216,7 @@ private:
&flushInfo.fVertexBuffer, &flushInfo.fVertexOffset)};
flushInfo.fIndexBuffer = target->resourceProvider()->refNonAAQuadIndexBuffer();
if (!vertices.fPtr || !flushInfo.fIndexBuffer) {
if (!vertices || !flushInfo.fIndexBuffer) {
SkDebugf("Could not allocate vertices\n");
return;
}

2
src/gpu/ops/StrokeRectOp.cpp
View File

@ -642,7 +642,7 @@ void AAStrokeRectOp::onPrepareDraws(GrMeshDrawTarget* target) {
fProgramInfo->geomProc().vertexStride(), std::move(indexBuffer),
verticesPerInstance, indicesPerInstance, instanceCount, maxQuads);
VertexWriter vertices{ helper.vertices() };
if (!vertices.fPtr) {
if (!vertices) {
SkDebugf("Could not allocate vertices\n");
return;
}