aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrRectanizer_pow2.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2014-06-02 07:15:18 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-02 07:15:18 -0700
commit901e96df6916e6f8ba95a4ea85a2ceac31e7d633 (patch)
treecd71e8f7860295756a76c2bfe351be2e791f67ac /src/gpu/GrRectanizer_pow2.cpp
parenta6a8f00a3977e71dbce9da50a32c5e9a51c49285 (diff)
Add Sample slide for Rectanizers
R=jvanverth@google.com, bsalomon@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/303263005
Diffstat (limited to 'src/gpu/GrRectanizer_pow2.cpp')
-rw-r--r--src/gpu/GrRectanizer_pow2.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gpu/GrRectanizer_pow2.cpp b/src/gpu/GrRectanizer_pow2.cpp
index d92e80c2d5..5da7e04528 100644
--- a/src/gpu/GrRectanizer_pow2.cpp
+++ b/src/gpu/GrRectanizer_pow2.cpp
@@ -7,7 +7,6 @@
*/
#include "GrRectanizer_pow2.h"
-#include "GrTBSearch.h"
bool GrRectanizerPow2::addRect(int width, int height, GrIPoint16* loc) {
if ((unsigned)width > (unsigned)this->width() ||
@@ -15,13 +14,8 @@ bool GrRectanizerPow2::addRect(int width, int height, GrIPoint16* loc) {
return false;
}
- int32_t area = width * height;
+ int32_t area = width * height; // computed here since height will be modified
- /*
- We use bsearch, but there may be more than one row with the same height,
- so we actually search for height-1, which can only be a pow2 itself if
- height == 2. Thus we set a minimum height.
- */
height = GrNextPow2(height);
if (height < kMIN_HEIGHT_POW2) {
height = kMIN_HEIGHT_POW2;