diff options
author | 2014-10-09 05:24:15 -0700 | |
---|---|---|
committer | 2014-10-09 05:24:15 -0700 | |
commit | 9e61bb7815b133bc40ea7b00fccc853f4b728e3c (patch) | |
tree | fb63fc7dbc1ede28f821af30fc0c6634e6e1168d /bench | |
parent | 78c71272fb26852bf3d2ca31785e61d4a598af82 (diff) |
Make the Sk GL context class an abstract base class
Make the Sk GL context class, SkGLNativeContext, an abstract base class. Before,
it depended on ifdefs to implement the platform dependent polymorphism. Move
the logic to subclasses of the various platform implementations.
This a step to enable Skia embedders to compile dm and bench_pictures. The
concrete goal is to support running these test apps with Chromium command buffer.
With this change, Chromium can implement its own version of SkGLNativeContext
that uses command buffer, and host the implementation in its own repository.
Implements the above by renaming the SkGLContextHelper to SkGLContext and
removing the unneeded SkGLNativeContext. Also removes
SkGLNativeContext::AutoRestoreContext functionality, it appeared to be unused:
no use in Skia code, and no tests.
BUG=skia:2992
Committed: https://skia.googlesource.com/skia/+/a90ed4e83897b45d6331ee4c54e1edd4054de9a8
Review URL: https://codereview.chromium.org/630843002
Diffstat (limited to 'bench')
-rw-r--r-- | bench/nanobench.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 21aeef4b3c..65cef8989e 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -84,7 +84,7 @@ static SkString humanize(double ms) { } #define HUMANIZE(ms) humanize(ms).c_str() -static double time(int loops, Benchmark* bench, SkCanvas* canvas, SkGLContextHelper* gl) { +static double time(int loops, Benchmark* bench, SkCanvas* canvas, SkGLContext* gl) { if (canvas) { canvas->clear(SK_ColorWHITE); } @@ -203,7 +203,7 @@ static int cpu_bench(const double overhead, Benchmark* bench, SkCanvas* canvas, } #if SK_SUPPORT_GPU -static int gpu_bench(SkGLContextHelper* gl, +static int gpu_bench(SkGLContext* gl, Benchmark* bench, SkCanvas* canvas, double* samples) { @@ -274,7 +274,7 @@ struct Target { const Config config; SkAutoTDelete<SkSurface> surface; #if SK_SUPPORT_GPU - SkGLContextHelper* gl; + SkGLContext* gl; #endif }; @@ -389,7 +389,7 @@ static void create_targets(SkTDArray<Target*>* targets, Benchmark* b, } #if SK_SUPPORT_GPU -static void fill_gpu_options(ResultsWriter* log, SkGLContextHelper* ctx) { +static void fill_gpu_options(ResultsWriter* log, SkGLContext* ctx) { const GrGLubyte* version; SK_GL_RET(*ctx, version, GetString(GR_GL_VERSION)); log->configOption("GL_VERSION", (const char*)(version)); |