diff options
author | 2015-12-23 01:33:00 -0800 | |
---|---|---|
committer | 2015-12-23 01:33:01 -0800 | |
commit | 3e980c3d88fbc509b79e7ccef16ca38f5bbfb180 (patch) | |
tree | 459161dd5ca1ca4e727d583a2d45106bd1324deb /bench | |
parent | 20b4ca12114d0676da2fd61b99f1577678d33abe (diff) |
Add config options to run different GPU APIs to dm and nanobench
Add extended config specification form that can be used to run different
gpu backend with different APIs.
The configs can be specified with the form:
gpu(api=string,dit=bool,nvpr=bool,samples=int)
This replaces and removes the --gpuAPI flag.
All existing configs should still work.
Adds following documentation:
out/Debug/dm --help config
Flags:
--config: type: string default: 565 8888 gpu nonrendering
Options: 565 8888 debug gpu gpudebug gpudft gpunull msaa16 msaa4
nonrendering null nullgpu nvprmsaa16 nvprmsaa4 pdf pdf_poppler skp svg
xps or use extended form 'backend(option=value,...)'.
Extended form: 'backend(option=value,...)'
Possible backends and options:
gpu(api=string,dit=bool,nvpr=bool,samples=int) GPU backend
api type: string default: native.
Select graphics API to use with gpu backend.
Options:
native Use platform default OpenGL or OpenGL ES backend.
gl Use OpenGL.
gles Use OpenGL ES.
debug Use debug OpenGL.
null Use null OpenGL.
dit type: bool default: false.
Use device independent text.
nvpr type: bool default: false.
Use NV_path_rendering OpenGL and OpenGL ES extension.
samples type: int default: 0.
Use multisampling with N samples.
Predefined configs:
gpu = gpu()
msaa4 = gpu(samples=4)
msaa16 = gpu(samples=16)
nvprmsaa4 = gpu(nvpr=true,samples=4)
nvprmsaa16 = gpu(nvpr=true,samples=16)
gpudft = gpu(dit=true)
gpudebug = gpu(api=debug)
gpunull = gpu(api=null)
debug = gpu(api=debug)
nullgpu = gpu(api=null)
BUG=skia:2992
Committed: https://skia.googlesource.com/skia/+/e13ca329fca4c28cf4e078561f591ab27b743d23
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1490113005
Committed: https://skia.googlesource.com/skia/+/c8b4336444e7b90382e04e33665fb3b8490b825b
Committed: https://skia.googlesource.com/skia/+/9ebc3f0ee6db215dde461dc4777d85988cf272dd
Review URL: https://codereview.chromium.org/1490113005
Diffstat (limited to 'bench')
-rw-r--r-- | bench/nanobench.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 11119be2e1..638477ecf6 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -28,6 +28,7 @@ #include "SkCanvas.h" #include "SkCodec.h" #include "SkCommonFlags.h" +#include "SkCommonFlagsConfig.h" #include "SkData.h" #include "SkForceLinking.h" #include "SkGraphics.h" @@ -168,11 +169,10 @@ struct GPUTarget : public Target { 0; SkSurfaceProps props(flags, SkSurfaceProps::kLegacyFontHost_InitType); this->surface.reset(SkSurface::NewRenderTarget(gGrFactory->get(this->config.ctxType, - kNone_GrGLStandard, this->config.ctxOptions), SkSurface::kNo_Budgeted, info, this->config.samples, &props)); - this->gl = gGrFactory->getContextInfo(this->config.ctxType, kNone_GrGLStandard, + this->gl = gGrFactory->getContextInfo(this->config.ctxType, this->config.ctxOptions)->fGLContext; if (!this->surface.get()) { return false; @@ -390,7 +390,7 @@ static bool is_gpu_config_allowed(const char* name, GrContextFactory::GLContextT if (!is_cpu_config_allowed(name)) { return false; } - if (const GrContext* ctx = gGrFactory->get(ctxType, kNone_GrGLStandard, ctxOptions)) { + if (const GrContext* ctx = gGrFactory->get(ctxType, ctxOptions)) { return sampleCnt <= ctx->caps()->maxSampleCount(); } return false; @@ -446,11 +446,13 @@ static void create_configs(SkTDArray<Config>* configs) { GPU_CONFIG(gpudft, kNative_GLContextType, kNone_GLContextOptions, 0, true) GPU_CONFIG(debug, kDebug_GLContextType, kNone_GLContextOptions, 0, false) GPU_CONFIG(nullgpu, kNull_GLContextType, kNone_GLContextOptions, 0, false) -#ifdef SK_ANGLE +#if SK_ANGLE +#ifdef SK_BUILD_FOR_WIN GPU_CONFIG(angle, kANGLE_GLContextType, kNone_GLContextOptions, 0, false) +#endif GPU_CONFIG(angle-gl, kANGLE_GL_GLContextType, kNone_GLContextOptions, 0, false) #endif -#ifdef SK_COMMAND_BUFFER +#if SK_COMMAND_BUFFER GPU_CONFIG(commandbuffer, kCommandBuffer_GLContextType, kNone_GLContextOptions, 0, false) #endif #if SK_MESA @@ -1166,7 +1168,7 @@ int nanobench_main() { #if SK_SUPPORT_GPU if (FLAGS_gpuStats && Benchmark::kGPU_Backend == configs[i].backend) { GrContext* context = gGrFactory->get(configs[i].ctxType, - kNone_GrGLStandard, configs[i].ctxOptions); + configs[i].ctxOptions); context->printCacheStats(); context->printGpuStats(); } |