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

Fix red/blue swap with backend textures on fiddle

Browse Source 
Bug: skia:
Change-Id: I99962cdc909c785a2c5225fcc0ebe8cde3cd0358
Reviewed-on: https://skia-review.googlesource.com/83864
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2017-12-12 16:24:41 -05:00 committed by Skia Commit-Bot
parent c822672854
commit 250e6e880f
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/fiddle/fiddle_main.cpp
View File

@ -10,6 +10,7 @@
#include <sstream>
#include <string>
#include "SkAutoPixmapStorage.h"
#include "SkCommandLineFlags.h"
#include "SkMipMap.h"
#include "SkUtils.h"
@ -135,13 +136,29 @@ static bool setup_backend_objects(GrContext* context,
backingDesc.fSampleCnt = 0;
if (!bm.empty()) {
SkPixmap originalPixmap;
SkPixmap* pixmap = &originalPixmap;
if (!bm.peekPixels(&originalPixmap)) {
return false;
}
SkAutoPixmapStorage rgbaPixmap;
if (kN32_SkColorType != kRGBA_8888_SkColorType) {
if (!rgbaPixmap.tryAlloc(bm.info().makeColorType(kRGBA_8888_SkColorType))) {
return false;
}
if (!bm.readPixels(rgbaPixmap)) {
return false;
}
pixmap = &rgbaPixmap;
}
int mipLevelCount = GrMipMapped::kYes == options.fMipMapping
? SkMipMap::ComputeLevelCount(bm.width(), bm.height())
: 1;
std::unique_ptr<GrMipLevel[]> texels(new GrMipLevel[mipLevelCount]);
texels[0].fPixels = bm.getPixels();
texels[0].fRowBytes = bm.rowBytes();
texels[0].fPixels = pixmap->addr();
texels[0].fRowBytes = pixmap->rowBytes();
for (int i = 1; i < mipLevelCount; i++) {
texels[i].fPixels = nullptr;