Make the debug interface a GrGLTestInterface subclass.

src/gpu/gl/GrGLCreateNullInterface.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "gl/GrGLInterface.h"
 #include "GrGLTestInterface.h"
@@ skipping 305 matching lines @@
                 break;
             case GR_GL_QUERY_COUNTER_BITS:
                 *params = 32;
                 break;
             default:
                 SkFAIL("Unexpected pname passed GetQueryiv.");
         }
     }
 
     GrGLvoid getQueryObjecti64v(GrGLuint id, GrGLenum pname, GrGLint64 *params) override {
-        queryResult(id, pname, params);
+        this->queryResult(id, pname, params);
     }
 
     GrGLvoid getQueryObjectiv(GrGLuint id, GrGLenum pname, GrGLint *params) override {
-        queryResult(id, pname, params);
+        this->queryResult(id, pname, params);
     }
 
     GrGLvoid getQueryObjectui64v(GrGLuint id, GrGLenum pname, GrGLuint64 *params) override {
-        queryResult(id, pname, params);
+        this->queryResult(id, pname, params);
     }
 
     GrGLvoid getQueryObjectuiv(GrGLuint id, GrGLenum pname, GrGLuint *params) override {
-        queryResult(id, pname, params);
+        this->queryResult(id, pname, params);
     }
 
     GrGLvoid getShaderiv(GrGLuint shader, GrGLenum pname, GrGLint* params) override {
         this->getShaderOrProgramiv(shader, pname, params);
     }
 
     GrGLvoid getShaderInfoLog(GrGLuint shader, GrGLsizei bufsize, GrGLsizei* length,
                               char* infolog) override {
         this->getInfoLog(shader, bufsize, length, infolog);
     }
 
     const GrGLubyte* getString(GrGLenum name) override {
         switch (name) {
             case GR_GL_EXTENSIONS:
                 return CombinedExtensionString();
             case GR_GL_VERSION:
-                return (const GrGLubyte*)"4.0 Debug GL";
+                return (const GrGLubyte*)"4.0 Null GL";
             case GR_GL_SHADING_LANGUAGE_VERSION:
-                return (const GrGLubyte*)"4.20.8 Debug GLSL";
+                return (const GrGLubyte*)"4.20.8 Null GLSL";
             case GR_GL_VENDOR:
-                return (const GrGLubyte*)"Debug Vendor";
+                return (const GrGLubyte*)"Null Vendor";
             case GR_GL_RENDERER:
-                return (const GrGLubyte*)"The Debug (Non-)Renderer";
+                return (const GrGLubyte*)"The Null (Non-)Renderer";
             default:
                 SkFAIL("Unexpected name passed to GetString");
                 return nullptr;
         }
     }
 
     const GrGLubyte* getStringi(GrGLenum name, GrGLuint i) override {
         switch (name) {
             case GR_GL_EXTENSIONS: {
                 GrGLint count;
                 this->getIntegerv(GR_GL_NUM_EXTENSIONS, &count);
                 if ((GrGLint)i <= count) {
                     return (const GrGLubyte*) kExtensions[i];
                 } else {
                     return nullptr;
                 }
             }
             default:
                 SkFAIL("Unexpected name passed to GetStringi");
                 return nullptr;
         }
     }
 
-    GrGLvoid getTexLevelParameteriv(GrGLenum target, GrGLint level, GrGLenum pname,
-                                    GrGLint* params) override {
-        // we used to use this to query stuff about externally created textures,
-        // now we just require clients to tell us everything about the texture.
-        SkFAIL("Should never query texture parameters.");
-    }
-
     GrGLint getUniformLocation(GrGLuint program, const char* name) override {
         return ++fCurrUniformLocation;
     }
 
     GrGLvoid* mapBufferRange(GrGLenum target, GrGLintptr offset, GrGLsizeiptr length,
                              GrGLbitfield access) override {
         GrGLuint id = 0;
         switch (target) {
             case GR_GL_ARRAY_BUFFER:
                 id = fCurrArrayBuffer;
@@ skipping 188 matching lines @@
                 *params = GR_GL_TRUE;
                 break;
             case GR_GL_QUERY_RESULT:
                 *params = 0;
                 break;
             default:
                 SkFAIL("Unexpected pname passed to GetQueryObject.");
                 break;
         }
     }
+
+    typedef GrGLTestInterface INHERITED;
 };
 
 const char* NullInterface::kExtensions[] = {
     "GL_ARB_framebuffer_object",
     "GL_ARB_blend_func_extended",
     "GL_ARB_timer_query",
     "GL_ARB_draw_buffers",
     "GL_ARB_occlusion_query",
     "GL_EXT_stencil_wrap",
     nullptr, // signifies the end of the array.
 };
 
 }  // anonymous namespace
 
 const GrGLInterface* GrGLCreateNullInterface() { return new NullInterface; }