diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-20 15:34:05 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-20 21:10:56 +0000 |
| commit | 5ec9def2dd7bba572398ff2aa9361fbbb3b478ed (patch) | |
| tree | 8e6105038fca868682ddf3a8306dce11b2e075ae /src/gpu/ops/GrDrawVerticesOp.cpp | |
| parent | 8c5bad35f5d98040f2db2ffd3ba9a924c7436784 (diff) | |
Rename files, macros, types, and functions related to GrDrawOp testing.
Make the test factories use sk_sp.
Change-Id: Idba630b84deb2848f2203a80fd72e1efa5fc6acf
Reviewed-on: https://skia-review.googlesource.com/6342
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/ops/GrDrawVerticesOp.cpp')
| -rw-r--r-- | src/gpu/ops/GrDrawVerticesOp.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp index 37be6d0d17..c6ae1c1efa 100644 --- a/src/gpu/ops/GrDrawVerticesOp.cpp +++ b/src/gpu/ops/GrDrawVerticesOp.cpp @@ -213,7 +213,7 @@ bool GrDrawVerticesOp::onCombineIfPossible(GrOp* t, const GrCaps& caps) { #ifdef GR_TEST_UTILS -#include "GrBatchTest.h" +#include "GrDrawOpTest.h" static uint32_t seed_vertices(GrPrimitiveType type) { switch (type) { @@ -274,7 +274,7 @@ static void randomize_params(size_t count, size_t maxVertex, SkScalar min, SkSca } } -DRAW_BATCH_TEST_DEFINE(VerticesOp) { +DRAW_OP_TEST_DEFINE(VerticesOp) { GrPrimitiveType type = GrPrimitiveType(random->nextULessThan(kLast_GrPrimitiveType + 1)); uint32_t primitiveCount = random->nextRangeU(1, 100); @@ -312,8 +312,7 @@ DRAW_BATCH_TEST_DEFINE(VerticesOp) { GrColor color = GrRandomColor(random); return GrDrawVerticesOp::Make(color, type, viewMatrix, positions.begin(), vertexCount, indices.begin(), hasIndices ? vertexCount : 0, colors.begin(), - texCoords.begin(), bounds) - .release(); + texCoords.begin(), bounds); } #endif |