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

Fix two issues in transfer to test

Browse Source 
1) Use buffer wider than texture when write pixels row bytes *is* supported
2) Fix buffer rowbytes/size calculation

Change-Id: I458010e75a42ada9b0fa9628fa0d2d4a3d823162
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/229816
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2019-07-25 13:20:58 -04:00
parent 8f72e8c95d
commit f27e51f8a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/TransferPixelsTest.cpp
View File

@ -92,7 +92,7 @@ void basic_transfer_to_test(skiatest::Reporter* reporter, GrContext* context, Gr
const int kTextureWidth = 16;
const int kTextureHeight = 16;
int srcBufferWidth = caps->writePixelsRowBytesSupport() ? 16 : 20;
int srcBufferWidth = caps->writePixelsRowBytesSupport() ? 20 : 16;
const int kBufferHeight = 16;
GrSurfaceDesc desc;
@ -111,8 +111,8 @@ void basic_transfer_to_test(skiatest::Reporter* reporter, GrContext* context, Gr
// The caps tell us what color type we are allowed to upload and read back from this texture,
// either of which may differ from 'colorType'.
GrColorType allowedSrc = caps->supportedWritePixelsColorType(desc.fConfig, colorType);
size_t srcRowBytes = GrColorTypeBytesPerPixel(allowedSrc) * kTextureWidth;
std::unique_ptr<char[]> srcData(new char[kTextureWidth * srcRowBytes]);
size_t srcRowBytes = GrColorTypeBytesPerPixel(allowedSrc) * srcBufferWidth;
std::unique_ptr<char[]> srcData(new char[kTextureHeight * srcRowBytes]);
fill_transfer_data(0, 0, kTextureWidth, kTextureHeight, srcBufferWidth, allowedSrc,
srcData.get());