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

draw vertices: rename textures -> texCoords

Browse Source 
Bug=skia:11822

Change-Id: I97c74658eb46704ba6d3b1ea2aa53f76eb869241
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/429416
Reviewed-by: Herb Derby <herb@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Herb Derby <herb@google.com>
This commit is contained in:
Herb Derby 2021-07-17 16:17:21 -04:00 committed by Skia Commit-Bot
parent 01e6273c46
commit 3d49efa8e1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/SkDraw_vertices.cpp
View File

@ -272,28 +272,28 @@ void SkDraw::drawFixedVertices(const SkVertices* vertices, SkBlendMode blendMode
const int vertexCount = info.vertexCount();
const int indexCount = info.indexCount();
const SkPoint* positions = info.positions();
const SkPoint* textures = info.texCoords();
const SkPoint* texCoords = info.texCoords();
const uint16_t* indices = info.indices();
const SkColor* colors = info.colors();
SkShader* shader = paint.getShader();
if (shader) {
if (!textures) {
textures = positions;
if (!texCoords) {
texCoords = positions;
}
} else {
textures = nullptr;
texCoords = nullptr;
}
// We can simplify things for certain blend modes. This is for speed, and SkComposeShader
// itself insists we don't pass kSrc or kDst to it.
if (colors && textures) {
if (colors && texCoords) {
switch (blendMode) {
case SkBlendMode::kSrc:
colors = nullptr;
break;
case SkBlendMode::kDst:
textures = nullptr;
texCoords = nullptr;
shader = nullptr;
break;
default: break;
@ -301,13 +301,13 @@ void SkDraw::drawFixedVertices(const SkVertices* vertices, SkBlendMode blendMode
}
// There is a paintShader iff there is texCoords.
SkASSERT((textures != nullptr) == (shader != nullptr));
SkASSERT((texCoords != nullptr) == (shader != nullptr));
VertState state(vertexCount, indices, indexCount);
VertState::Proc vertProc = state.chooseProc(info.mode());
// No colors are changing and no texture coordinates are changing, so no updates between
// triangles are needed. Use SkVM to blit the triangles.
if (!colors && (!textures || textures == positions)) {
if (!colors && (!texCoords || texCoords == positions)) {
if (auto blitter = SkCreateSkVMBlitter(
fDst, paint, *fMatrixProvider, outerAlloc, this->fRC->clipShader())) {
while (vertProc(&state)) {
@ -346,7 +346,7 @@ void SkDraw::drawFixedVertices(const SkVertices* vertices, SkBlendMode blendMode
SkPaint shaderPaint(paint);
shaderPaint.setShader(sk_ref_sp(shader));
if (!textures) { // only tricolor shader
if (!texCoords) { // only tricolor shader
if (auto blitter = SkCreateRasterPipelineBlitter(
fDst, shaderPaint, *fMatrixProvider, outerAlloc, this->fRC->clipShader())) {
while (vertProc(&state)) {
@ -379,7 +379,7 @@ void SkDraw::drawFixedVertices(const SkVertices* vertices, SkBlendMode blendMode
}
// Positions as texCoords? The local matrix is always identity, so update once
if (textures == positions) {
if (texCoords == positions) {
SkMatrix localM;
if (!updater->update(ctm, &localM)) {
return;
@ -395,8 +395,8 @@ void SkDraw::drawFixedVertices(const SkVertices* vertices, SkBlendMode blendMode
}
SkMatrix localM;
if ((textures == positions) ||
(texture_to_matrix(state, positions, textures, &localM) &&
if ((texCoords == positions) ||
(texture_to_matrix(state, positions, texCoords, &localM) &&
updater->update(ctm, &localM))) {
fill_triangle(state, blitter, *fRC, dev2, dev3);
}
@ -414,9 +414,9 @@ void SkDraw::drawFixedVertices(const SkVertices* vertices, SkBlendMode blendMode
const SkMatrixProvider* matrixProvider = fMatrixProvider;
SkTLazy<SkPreConcatMatrixProvider> preConcatMatrixProvider;
if (textures && (textures != positions)) {
if (texCoords && (texCoords != positions)) {
SkMatrix localM;
if (!texture_to_matrix(state, positions, textures, &localM)) {
if (!texture_to_matrix(state, positions, texCoords, &localM)) {
continue;
}
matrixProvider = preConcatMatrixProvider.init(*matrixProvider, localM);