e4ddb8a7cd
This reverts commit 77e1f84a84.
Reason for revert: breaking google3 roll?
Original change's description:
> Specialize SkRectanzier to SkRectanizerSkyline
>
> It looks like the pow2 rectanizer has never been used. Remove
> the unneeded abstraction for rectanizer everywhere.
>
> Change-Id: Iba33f1c6faf37201d03928ce8409751c212480a0
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/265983
> Commit-Queue: Herb Derby <herb@google.com>
> Reviewed-by: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,herb@google.com
Change-Id: I2573534f3ea95c98d089f9c19b027564e77015db
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/266116
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
71 lines
2.2 KiB
C++
71 lines
2.2 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "include/core/SkSize.h"
|
|
#include "include/private/SkTDArray.h"
|
|
#include "include/utils/SkRandom.h"
|
|
#include "src/gpu/GrRectanizer_pow2.h"
|
|
#include "src/gpu/GrRectanizer_skyline.h"
|
|
#include "tests/Test.h"
|
|
|
|
static const int kWidth = 1024;
|
|
static const int kHeight = 1024;
|
|
|
|
// Basic test of a GrRectanizer-derived class' functionality
|
|
static void test_rectanizer_basic(skiatest::Reporter* reporter, GrRectanizer* rectanizer) {
|
|
REPORTER_ASSERT(reporter, kWidth == rectanizer->width());
|
|
REPORTER_ASSERT(reporter, kHeight == rectanizer->height());
|
|
|
|
SkIPoint16 loc;
|
|
|
|
REPORTER_ASSERT(reporter, rectanizer->addRect(50, 50, &loc));
|
|
REPORTER_ASSERT(reporter, rectanizer->percentFull() > 0.0f);
|
|
rectanizer->reset();
|
|
REPORTER_ASSERT(reporter, rectanizer->percentFull() == 0.0f);
|
|
}
|
|
|
|
static void test_rectanizer_inserts(skiatest::Reporter*,
|
|
GrRectanizer* rectanizer,
|
|
const SkTDArray<SkISize>& rects) {
|
|
int i;
|
|
for (i = 0; i < rects.count(); ++i) {
|
|
SkIPoint16 loc;
|
|
if (!rectanizer->addRect(rects[i].fWidth, rects[i].fHeight, &loc)) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
//SkDebugf("\n***%d %f\n", i, rectanizer->percentFull());
|
|
}
|
|
|
|
static void test_skyline(skiatest::Reporter* reporter, const SkTDArray<SkISize>& rects) {
|
|
GrRectanizerSkyline skylineRectanizer(kWidth, kHeight);
|
|
|
|
test_rectanizer_basic(reporter, &skylineRectanizer);
|
|
test_rectanizer_inserts(reporter, &skylineRectanizer, rects);
|
|
}
|
|
|
|
static void test_pow2(skiatest::Reporter* reporter, const SkTDArray<SkISize>& rects) {
|
|
GrRectanizerPow2 pow2Rectanizer(kWidth, kHeight);
|
|
|
|
test_rectanizer_basic(reporter, &pow2Rectanizer);
|
|
test_rectanizer_inserts(reporter, &pow2Rectanizer, rects);
|
|
}
|
|
|
|
DEF_GPUTEST(GpuRectanizer, reporter, factory) {
|
|
SkTDArray<SkISize> rects;
|
|
SkRandom rand;
|
|
|
|
for (int i = 0; i < 50; i++) {
|
|
rects.push_back(SkISize::Make(rand.nextRangeU(1, kWidth / 2),
|
|
rand.nextRangeU(1, kHeight / 2)));
|
|
}
|
|
|
|
test_skyline(reporter, rects);
|
|
test_pow2(reporter, rects);
|
|
}
|