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

Revert of Remove rt flags that are not necessary (patchset #1 id:1 of https://codereview.chromium.org/1226123012/)

Browse Source 
Reason for revert:
breaks tests, e.g.
https://build.chromium.org/p/client.skia.android/builders/Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Release/builds/752/steps/dm/logs/stdio

Original issue's description:
> Remove rt flags that are not necessary
>
> Committed: https://skia.googlesource.com/skia/+/b6b0a6ef179f4143c94ba7e0e1be6e7ce4b0a23a

TBR=joshualitt@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1234503004
This commit is contained in:
bsalomon 2015-07-16 10:00:28 -07:00 committed by Commit bot
parent b6b0a6ef17
commit bea0150d83
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/FloatingPointTextureTest.cpp
View File

@ -42,6 +42,7 @@ void runFPTest(skiatest::Reporter* reporter, GrContextFactory* factory,
for (int origin = 0; origin < 2; ++origin) { for (int origin = 0; origin < 2; ++origin) {
for (int glCtxType = 0; glCtxType < GrContextFactory::kGLContextTypeCnt; ++glCtxType) { for (int glCtxType = 0; glCtxType < GrContextFactory::kGLContextTypeCnt; ++glCtxType) {
GrSurfaceDesc desc; GrSurfaceDesc desc;
desc.fFlags = kRenderTarget_GrSurfaceFlag;
desc.fWidth = DEV_W; desc.fWidth = DEV_W;
desc.fHeight = DEV_H; desc.fHeight = DEV_H;
desc.fConfig = config; desc.fConfig = config;

1
tests/GLProgramsTest.cpp
View File

@ -200,6 +200,7 @@ static void set_random_stencil(GrPipelineBuilder* pipelineBuilder, SkRandom* ran
bool GrDrawTarget::programUnitTest(GrContext* context, int maxStages) { bool GrDrawTarget::programUnitTest(GrContext* context, int maxStages) {
// setup dummy textures // setup dummy textures
GrSurfaceDesc dummyDesc; GrSurfaceDesc dummyDesc;
dummyDesc.fFlags = kRenderTarget_GrSurfaceFlag;
dummyDesc.fConfig = kSkia8888_GrPixelConfig; dummyDesc.fConfig = kSkia8888_GrPixelConfig;
dummyDesc.fWidth = 34; dummyDesc.fWidth = 34;
dummyDesc.fHeight = 18; dummyDesc.fHeight = 18;

1
tests/SurfaceTest.cpp
View File

@ -952,6 +952,7 @@ DEF_GPUTEST(SkImage_NewFromTexture, reporter, factory) {
sk_memset32(storage, expected0, w * h); sk_memset32(storage, expected0, w * h);
GrSurfaceDesc desc; GrSurfaceDesc desc;
desc.fFlags = kRenderTarget_GrSurfaceFlag; // needs to be a rendertarget for readpixels();
desc.fOrigin = kDefault_GrSurfaceOrigin; desc.fOrigin = kDefault_GrSurfaceOrigin;
desc.fWidth = w; desc.fWidth = w;
desc.fHeight = h; desc.fHeight = h;