aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm/DM.cpp
diff options
context:
space:
mode:
authorGravatar csmartdalton <csmartdalton@google.com>2016-07-29 08:14:20 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-07-29 08:14:20 -0700
commite0d362929d6569e8737d80dead791c640390e819 (patch)
tree3943140ef518a4fc3962672a74039cb776f1ef48 /dm/DM.cpp
parent0d9990f052670a8af29e1e775c414810f8fc6e86 (diff)
Add test configs for instanced rendering
Adds the following configs and enables them on select bots: glinst, glinst4, glinstdit4, glinst16, glinstdit16, esinst, esinst4, esinstdit4 Makes general changes to GrContextOptions, GrCaps, etc. to facilitate this. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2182783004 Review-Url: https://codereview.chromium.org/2182783004
Diffstat (limited to 'dm/DM.cpp')
-rw-r--r--dm/DM.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 772cfe054d..7fe6efaf89 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -832,6 +832,10 @@ static Sink* create_sink(const SkCommandLineConfig* config) {
contextOptions = static_cast<GrContextFactory::ContextOptions>(
contextOptions | GrContextFactory::kEnableNVPR_ContextOptions);
}
+ if (gpuConfig->getUseInstanced()) {
+ contextOptions = static_cast<GrContextFactory::ContextOptions>(
+ contextOptions | GrContextFactory::kUseInstanced_ContextOptions);
+ }
if (SkColorAndColorSpaceAreGammaCorrect(gpuConfig->getColorType(),
gpuConfig->getColorSpace())) {
contextOptions = static_cast<GrContextFactory::ContextOptions>(