Revert of Support GL_SAMPLES queries in null contexts

tools/gpu/gl/debug/DebugGLTestContext.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DebugGLTestContext.h"
 
@@ skipping 355 matching lines @@
             GrAlwaysAssert(!buffer->getDepthBound());
             // However, at GrContext destroy time we release all GrRsources and so stencil buffers
             // may get deleted before FBOs that refer to them.
             //GrAlwaysAssert(!buffer->getStencilBound());
 
             GrAlwaysAssert(!buffer->getDeleted());
             buffer->deleteAction();
         }
     }
 
-    GrGLvoid renderbufferStorage(GrGLenum target, GrGLenum internalformat, GrGLsizei width,
-                                 GrGLsizei height) override {
-        GrAlwaysAssert(GR_GL_RENDERBUFFER == target);
-        GrRenderBufferObj* renderBuffer = this->getRenderBuffer();
-        GrAlwaysAssert(renderBuffer);
-        renderBuffer->setNumSamples(1);
-    }
-
-    GrGLvoid renderbufferStorageMultisample(GrGLenum target, GrGLsizei samples,
-                                            GrGLenum internalformat, GrGLsizei width,
-                                            GrGLsizei height) override {
-        GrAlwaysAssert(GR_GL_RENDERBUFFER == target);
-        GrRenderBufferObj* renderBuffer = this->getRenderBuffer();
-        GrAlwaysAssert(renderBuffer);
-        renderBuffer->setNumSamples(samples);
-    }
-
-    GrGLvoid namedRenderbufferStorage(GrGLuint renderbuffer, GrGLenum GrGLinternalformat,
-                                      GrGLsizei width, GrGLsizei height) override {
-        SK_ABORT("Not implemented");
-    }
-
-    GrGLvoid namedRenderbufferStorageMultisample(GrGLuint renderbuffer, GrGLsizei samples,
-                                                 GrGLenum GrGLinternalformat, GrGLsizei width,
-                                                 GrGLsizei height) override {
-        SK_ABORT("Not implemented");
-    }
-
     GrGLvoid framebufferRenderbuffer(GrGLenum target,
                                      GrGLenum attachment,
                                      GrGLenum renderbuffertarget,
                                      GrGLuint renderBufferID) override {
 
         GrAlwaysAssert(GR_GL_FRAMEBUFFER == target);
         GrAlwaysAssert(GR_GL_COLOR_ATTACHMENT0 == attachment ||
                        GR_GL_DEPTH_ATTACHMENT == attachment ||
                        GR_GL_STENCIL_ATTACHMENT == attachment);
         GrAlwaysAssert(GR_GL_RENDERBUFFER == renderbuffertarget);
@@ skipping 17 matching lines @@
             case GR_GL_STENCIL_ATTACHMENT:
                 framebuffer->setStencil(renderbuffer);
                 break;
             default:
                 GrAlwaysAssert(false);
                 break;
         };
 
     }
 
-    GrGLvoid namedFramebufferRenderbuffer(GrGLuint framebuffer, GrGLenum attachment,
-                                          GrGLenum renderbuffertarget,
-                                          GrGLuint renderbuffer) override {
-        SK_ABORT("Not implemented");
-    }
-
     ////////////////////////////////////////////////////////////////////////////////
     GrGLvoid framebufferTexture2D(GrGLenum target, GrGLenum attachment, GrGLenum textarget,
                                   GrGLuint textureID, GrGLint level) override {
 
         GrAlwaysAssert(GR_GL_FRAMEBUFFER == target);
         GrAlwaysAssert(GR_GL_COLOR_ATTACHMENT0 == attachment ||
                        GR_GL_DEPTH_ATTACHMENT == attachment ||
                        GR_GL_STENCIL_ATTACHMENT == attachment);
         GrAlwaysAssert(GR_GL_TEXTURE_2D == textarget);
 
@@ skipping 20 matching lines @@
                 break;
             case GR_GL_STENCIL_ATTACHMENT:
                 framebuffer->setStencil(texture);
                 break;
             default:
                 GrAlwaysAssert(false);
                 break;
         };
     }
 
-    GrGLvoid framebufferTexture2DMultisample(GrGLenum target, GrGLenum attachment,
-                                             GrGLenum textarget, GrGLuint texture, GrGLint level,
-                                             GrGLsizei samples) override {
-        SK_ABORT("Not implemented");
-    }
-
-    GrGLvoid namedFramebufferTexture1D(GrGLuint framebuffer, GrGLenum attachment,
-                                       GrGLenum textarget, GrGLuint texture,
-                                       GrGLint level) override {
-        SK_ABORT("Not implemented");
-    }
-
-    GrGLvoid namedFramebufferTexture2D(GrGLuint framebuffer, GrGLenum attachment,
-                                       GrGLenum textarget, GrGLuint texture,
-                                       GrGLint level) override {
-        SK_ABORT("Not implemented");
-    }
-
-    GrGLvoid namedFramebufferTexture3D(GrGLuint framebuffer, GrGLenum attachment,
-                                       GrGLenum textarget, GrGLuint texture, GrGLint level,
-                                       GrGLint zoffset) override {
-        SK_ABORT("Not implemented");
-    }
-
     GrGLuint createProgram() override {
 
         GrProgramObj *program = CREATE(GrProgramObj, kProgram_ObjTypes);
 
         return program->getID();
     }
 
     GrGLuint createShader(GrGLenum type) override {
 
         GrAlwaysAssert(GR_GL_VERTEX_SHADER == type ||
@@ skipping 60 matching lines @@
     GrGLvoid getIntegerv(GrGLenum pname, GrGLint* params) override {
         // TODO: remove from Ganesh the #defines for gets we don't use.
         // We would like to minimize gets overall due to performance issues
         switch (pname) {
             case GR_GL_CONTEXT_PROFILE_MASK:
                 *params = GR_GL_CONTEXT_COMPATIBILITY_PROFILE_BIT;
                 break;
             case GR_GL_STENCIL_BITS:
                 *params = 8;
                 break;
-            case GR_GL_SAMPLES: {
-                GrFrameBufferObj* framebuffer = this->getFrameBuffer();
-                GrAlwaysAssert(framebuffer);
-                int numSamples = 0;
-
-                if (GrFBBindableObj* stencil = framebuffer->getStencil()) {
-                    numSamples = stencil->numSamples();
-                }
-                if (GrFBBindableObj* depth = framebuffer->getDepth()) {
-                    GrAlwaysAssert(!numSamples || numSamples == depth->numSamples());
-                    numSamples = depth->numSamples();
-                }
-                if (GrFBBindableObj* color = framebuffer->getColor()) {
-                    GrAlwaysAssert(!numSamples || numSamples == color->numSamples());
-                    numSamples = color->numSamples();
-                }
-                GrAlwaysAssert(numSamples);
-                *params = numSamples;
+            case GR_GL_SAMPLES:
+                *params = 1;
                 break;
-            }
             case GR_GL_FRAMEBUFFER_BINDING:
                 *params = 0;
                 break;
             case GR_GL_VIEWPORT:
                 params[0] = 0;
                 params[1] = 0;
                 params[2] = 800;
                 params[3] = 600;
                 break;
             case GR_GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS:
@@ skipping 589 matching lines @@
 namespace sk_gpu_test {
 GLTestContext* CreateDebugGLTestContext() {
     GLTestContext* ctx = new DebugGLContext();
     if (ctx->isValid()) {
         return ctx;
     }
     delete ctx;
     return nullptr;
 }
 }