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

Remove border from GrAtlas entries, and associated copy.

Browse Source 
BUG=skia:2178
R=bsalomon@google.com

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/166483005

git-svn-id: http://skia.googlecode.com/svn/trunk@13458 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-02-14 18:41:47 +00:00
parent 550db50db3
commit f952924e17
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gpu/GrAtlas.cpp
View File

@ -35,8 +35,6 @@
///////////////////////////////////////////////////////////////////////////////
#define BORDER 1
#ifdef SK_DEBUG
static int gCounter;
#endif
@ -53,8 +51,8 @@ GrPlot::GrPlot() : fDrawToken(NULL, 0)
, fAtlasMgr(NULL)
, fBytesPerPixel(1)
{
fRects = GrRectanizer::Factory(GR_ATLAS_WIDTH - BORDER,
GR_ATLAS_HEIGHT - BORDER);
fRects = GrRectanizer::Factory(GR_ATLAS_WIDTH,
GR_ATLAS_HEIGHT);
fOffset.set(0, 0);
}
@ -74,42 +72,21 @@ static inline uint8_t* zero_fill(uint8_t* ptr, size_t count) {
bool GrPlot::addSubImage(int width, int height, const void* image,
GrIPoint16* loc) {
if (!fRects->addRect(width + BORDER, height + BORDER, loc)) {
if (!fRects->addRect(width, height, loc)) {
return false;
}
SkAutoSMalloc<1024> storage;
int dstW = width + 2*BORDER;
int dstH = height + 2*BORDER;
if (BORDER) {
const size_t dstRB = dstW * fBytesPerPixel;
uint8_t* dst = (uint8_t*)storage.reset(dstH * dstRB);
sk_bzero(dst, dstRB); // zero top row
dst += dstRB;
for (int y = 0; y < height; y++) {
dst = zero_fill(dst, fBytesPerPixel); // zero left edge
memcpy(dst, image, width * fBytesPerPixel);
dst += width * fBytesPerPixel;
dst = zero_fill(dst, fBytesPerPixel); // zero right edge
image = (const void*)((const char*)image + width * fBytesPerPixel);
}
sk_bzero(dst, dstRB); // zero bottom row
image = storage.get();
}
adjust_for_offset(loc, fOffset);
GrContext* context = fTexture->getContext();
// We pass the flag that does not force a flush. We assume our caller is
// smart and hasn't referenced the part of the texture we're about to update
// since the last flush.
context->writeTexturePixels(fTexture,
loc->fX, loc->fY, dstW, dstH,
loc->fX, loc->fY, width, height,
fTexture->config(), image, 0,
GrContext::kDontFlush_PixelOpsFlag);
// now tell the caller to skip the top/left BORDER
loc->fX += BORDER;
loc->fY += BORDER;
#if FONT_CACHE_STATS
++g_UploadCount;
#endif