aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu
diff options
context:
space:
mode:
authorGravatar Chris Dalton <csmartdalton@google.com>2018-04-18 13:24:25 -0600
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-18 20:00:53 +0000
commit91ab15588451be2f7ec87635590f1e4f90bbbf9a (patch)
tree81c7c8e4519675b086fdb0a0bd323883e7fd3037 /include/gpu
parent15a64e71f68f7d1fcd16247c3d30375d3e2f41e8 (diff)
Always call endFlush on opLists that might survive a flush
We were missing a few that got unreffed due to failed proxy instantiation. Bug: skia:7655 Bug: skia:7111 Change-Id: I95847a16890f2993a1433d4d9fdaa8a4a6c2f0b6 Reviewed-on: https://skia-review.googlesource.com/122121 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'include/gpu')
-rw-r--r--include/gpu/mock/GrMockTypes.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/gpu/mock/GrMockTypes.h b/include/gpu/mock/GrMockTypes.h
index 5ca0730956..2d559a95a5 100644
--- a/include/gpu/mock/GrMockTypes.h
+++ b/include/gpu/mock/GrMockTypes.h
@@ -52,7 +52,7 @@ struct GrMockOptions {
bool fTexturable = false;
};
- // GPU options.
+ // GrCaps options.
bool fInstanceAttribSupport = false;
uint32_t fMapBufferFlags = 0;
int fMaxTextureSize = 2048;
@@ -60,7 +60,7 @@ struct GrMockOptions {
int fMaxVertexAttributes = 16;
ConfigOptions fConfigOptions[kGrPixelConfigCnt];
- // Shader options.
+ // GrShaderCaps options.
bool fGeometryShaderSupport = false;
bool fTexelBufferSupport = false;
bool fIntegerSupport = false;
@@ -68,6 +68,9 @@ struct GrMockOptions {
int fMaxVertexSamplers = 0;
int fMaxFragmentSamplers = 8;
bool fShaderDerivativeSupport = true;
+
+ // GrMockGpu options.
+ bool fFailTextureAllocations = false;
};
#endif