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
Review URL: https://codereview.chromium.org/630843002
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index 705849d..ca44985 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -228,7 +228,7 @@
void PictureRenderer::resetState(bool callFinish) {
#if SK_SUPPORT_GPU
- SkGLContextHelper* glContext = this->getGLContext();
+ SkGLContext* glContext = this->getGLContext();
if (NULL == glContext) {
SkASSERT(kBitmap_DeviceType == fDeviceType);
return;
@@ -248,7 +248,7 @@
pool->dumpPool();
#if SK_SUPPORT_GPU
- SkGLContextHelper* glContext = this->getGLContext();
+ SkGLContext* glContext = this->getGLContext();
if (NULL == glContext) {
SkASSERT(kBitmap_DeviceType == fDeviceType);
return;
diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index 04ac20f..8465af2 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -30,7 +30,7 @@
class SkBitmap;
class SkCanvas;
-class SkGLContextHelper;
+class SkGLContext;
class SkThread;
namespace sk_tools {
@@ -369,7 +369,7 @@
}
}
- SkGLContextHelper* getGLContext() {
+ SkGLContext* getGLContext() {
GrContextFactory::GLContextType glContextType
= GrContextFactory::kNull_GLContextType;
switch(fDeviceType) {
diff --git a/tools/timer/GpuTimer.cpp b/tools/timer/GpuTimer.cpp
index aac10a3..0fdd999 100644
--- a/tools/timer/GpuTimer.cpp
+++ b/tools/timer/GpuTimer.cpp
@@ -6,10 +6,10 @@
* found in the LICENSE file.
*/
#include "GpuTimer.h"
-#include "gl/SkGLContextHelper.h"
+#include "gl/SkGLContext.h"
#include "gl/GrGLUtil.h"
-GpuTimer::GpuTimer(const SkGLContextHelper* glctx) : fContext(glctx) {
+GpuTimer::GpuTimer(const SkGLContext* glctx) : fContext(glctx) {
if (fContext) {
fContext->ref();
fContext->makeCurrent();
diff --git a/tools/timer/GpuTimer.h b/tools/timer/GpuTimer.h
index 2100312..da1fdab 100644
--- a/tools/timer/GpuTimer.h
+++ b/tools/timer/GpuTimer.h
@@ -7,18 +7,18 @@
#ifndef GpuTimer_DEFINED
#define GpuTimer_DEFINED
-class SkGLContextHelper;
+class SkGLContext;
class GpuTimer {
public:
- GpuTimer(const SkGLContextHelper*);
+ GpuTimer(const SkGLContext*);
~GpuTimer();
void start();
double end();
private:
unsigned fQuery;
int fStarted;
- const SkGLContextHelper* fContext;
+ const SkGLContext* fContext;
bool fSupported;
};
diff --git a/tools/timer/Timer.cpp b/tools/timer/Timer.cpp
index 4f3fc85..a9f04af 100644
--- a/tools/timer/Timer.cpp
+++ b/tools/timer/Timer.cpp
@@ -6,7 +6,7 @@
*/
#include "Timer.h"
-Timer::Timer(SkGLContextHelper* gl)
+Timer::Timer(SkGLContext* gl)
: fCpu(-1.0)
, fWall(-1.0)
, fTruncatedCpu(-1.0)
diff --git a/tools/timer/Timer.h b/tools/timer/Timer.h
index 15c93f5..81d1ca5 100644
--- a/tools/timer/Timer.h
+++ b/tools/timer/Timer.h
@@ -21,7 +21,7 @@
#include "GpuTimer.h"
#endif
-class SkGLContextHelper;
+class SkGLContext;
/**
* SysTimers and GpuTimers are implemented orthogonally.
@@ -34,7 +34,7 @@
*/
class Timer {
public:
- explicit Timer(SkGLContextHelper* gl = NULL);
+ explicit Timer(SkGLContext* gl = NULL);
void start();
void truncatedEnd();