AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix skia_use_gl = false build

Browse Source 
Fix a number of warnings as errors about unused private methods when
skia_use_gl is set to false and SK_GL is not set.

Change-Id: Idcc08a1434ec11a6ce9c8df034c9fa472bf08d08
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/436822
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
This commit is contained in:
Ben Wagner 2021-08-05 10:14:23 -04:00 committed by SkCQ
parent c0bfdffe3d
commit a3f996c70d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/gpu/gl/GLTestContext.cpp
View File

@ -22,9 +22,10 @@ public:
void deleteQuery(sk_gpu_test::PlatformTimerQuery) override; void deleteQuery(sk_gpu_test::PlatformTimerQuery) override;
private: private:
#ifdef SK_GL
GLGpuTimer(bool disjointSupport, const sk_gpu_test::GLTestContext*, const char* ext = ""); GLGpuTimer(bool disjointSupport, const sk_gpu_test::GLTestContext*, const char* ext = "");
bool validate() const; bool validate() const;
#endif
sk_gpu_test::PlatformTimerQuery onQueueTimerStart() const override; sk_gpu_test::PlatformTimerQuery onQueueTimerStart() const override;
void onQueueTimerStop(sk_gpu_test::PlatformTimerQuery) const override; void onQueueTimerStop(sk_gpu_test::PlatformTimerQuery) const override;
@ -75,6 +76,7 @@ std::unique_ptr<GLGpuTimer> GLGpuTimer::MakeIfSupported(const sk_gpu_test::GLTes
#endif #endif
} }
#ifdef SK_GL
GLGpuTimer::GLGpuTimer(bool disjointSupport, const sk_gpu_test::GLTestContext* ctx, const char* ext) GLGpuTimer::GLGpuTimer(bool disjointSupport, const sk_gpu_test::GLTestContext* ctx, const char* ext)
: INHERITED(disjointSupport) { : INHERITED(disjointSupport) {
ctx->getGLProcAddress(&fGLGetIntegerv, "glGetIntegerv"); ctx->getGLProcAddress(&fGLGetIntegerv, "glGetIntegerv");
@ -90,6 +92,7 @@ bool GLGpuTimer::validate() const {
return fGLGetIntegerv && fGLGenQueries && fGLDeleteQueries && fGLBeginQuery && fGLEndQuery && return fGLGetIntegerv && fGLGenQueries && fGLDeleteQueries && fGLBeginQuery && fGLEndQuery &&
fGLGetQueryObjectuiv && fGLGetQueryObjectui64v; fGLGetQueryObjectuiv && fGLGetQueryObjectui64v;
} }
#endif
sk_gpu_test::PlatformTimerQuery GLGpuTimer::onQueueTimerStart() const { sk_gpu_test::PlatformTimerQuery GLGpuTimer::onQueueTimerStart() const {
GrGLuint queryID; GrGLuint queryID;