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

misc fixes to make float buffers work a little better

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1703013002

TBR=fmalita

Review URL: https://codereview.chromium.org/1703013002
This commit is contained in:
reed 2016-02-17 07:15:29 -08:00 committed by Commit bot
parent 34d26b9652
commit d96e7e503f
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/SkBitmap.cpp
View File

@ -563,6 +563,8 @@ void* SkBitmap::getAddr(int x, int y) const {
return base;
}
#include "SkHalf.h"
SkColor SkBitmap::getColor(int x, int y) const {
SkASSERT((unsigned)x < (unsigned)this->width());
SkASSERT((unsigned)y < (unsigned)this->height());
@ -599,6 +601,18 @@ SkColor SkBitmap::getColor(int x, int y) const {
SkPMColor c = SkSwizzle_RGBA_to_PMColor(addr[0]);
return SkUnPreMultiply::PMColorToColor(c);
}
case kRGBA_F16_SkColorType: {
const uint64_t* addr = (const uint64_t*)fPixels + y * (fRowBytes >> 3) + x;
Sk4f p4 = SkHalfToFloat_01(addr[0]);
if (p4[3]) {
float inva = 1 / p4[3];
p4 = p4 * Sk4f(inva, inva, inva, 1);
}
SkColor c;
SkNx_cast<uint8_t>(p4 * Sk4f(255) + Sk4f(0.5f)).store(&c);
// p4 is RGBA, but we want BGRA, so we need to swap next
return SkSwizzle_RB(c);
}
default:
SkASSERT(false);
return 0;

4
src/core/SkBlitter.cpp
View File

@ -127,6 +127,10 @@ static uint8_t generate_right_mask(int maskBitCount) {
void SkBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {
SkASSERT(mask.fBounds.contains(clip));
if (mask.fFormat == SkMask::kLCD16_Format) {
return; // needs to be handled by subclass
}
if (mask.fFormat == SkMask::kBW_Format) {
int cx = clip.fLeft;
int cy = clip.fTop;

13
src/core/SkConfig8888.cpp
View File

@ -173,9 +173,20 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
if (srcInfo.dimensions() != dstInfo.dimensions()) {
return false;
}
const int width = srcInfo.width();
const int height = srcInfo.height();
// Do the easiest one first : both configs are equal
if ((srcInfo == dstInfo) && !ctable) {
size_t bytes = width * srcInfo.bytesPerPixel();
for (int y = 0; y < height; ++y) {
memcpy(dstPixels, srcPixels, bytes);
srcPixels = (const char*)srcPixels + srcRB;
dstPixels = (char*)dstPixels + dstRB;
}
return true;
}
// Handle fancy alpha swizzling if both are ARGB32
if (4 == srcInfo.bytesPerPixel() && 4 == dstInfo.bytesPerPixel()) {