From 1fe1858a90532f4db578bffb97936742d39ede49 Mon Sep 17 00:00:00 2001 From: djsollen Date: Fri, 12 Jun 2015 12:01:15 -0700 Subject: Revert of Import functionality for new GL backend (patchset #2 id:20001 of https://codereview.chromium.org/1185573003/) Reason for revert: breaking multiple builds. For example... https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Debug-ASAN/builds/667 Original issue's description: > Import functionality for new GL backend > > Brings in the following functionality: > > ARB_draw_instanced > ARB_instanced_arrays > NV_bindless_texture > EXT_direct_state_access > KHR_debug > > Also cleans up some of the NVPR extension loading. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/202c4c75fb806f751cf796850bf67fe9793e0643 TBR=bsalomon@google.com,cdalton@nvidia.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1184863002 --- src/gpu/gl/debug/GrGLCreateDebugInterface.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/gpu/gl/debug') diff --git a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp index 5c5e407c32..e60c519be3 100644 --- a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp +++ b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp @@ -875,11 +875,9 @@ const GrGLInterface* GrGLCreateDebugInterface() { functions->fDisable = noOpGLDisable; functions->fDisableVertexAttribArray = noOpGLDisableVertexAttribArray; functions->fDrawArrays = noOpGLDrawArrays; - functions->fDrawArraysInstanced = noOpGLDrawArraysInstanced; functions->fDrawBuffer = noOpGLDrawBuffer; functions->fDrawBuffers = noOpGLDrawBuffers; functions->fDrawElements = noOpGLDrawElements; - functions->fDrawElementsInstanced = noOpGLDrawElementsInstanced; functions->fEnable = noOpGLEnable; functions->fEnableVertexAttribArray = noOpGLEnableVertexAttribArray; functions->fEndQuery = noOpGLEndQuery; @@ -956,7 +954,6 @@ const GrGLInterface* GrGLCreateDebugInterface() { functions->fVertexAttrib3fv = noOpGLVertexAttrib3fv; functions->fVertexAttrib4fv = noOpGLVertexAttrib4fv; functions->fVertexAttribPointer = noOpGLVertexAttribPointer; - functions->fVertexAttribDivisor = noOpGLVertexAttribDivisor; functions->fViewport = noOpGLViewport; functions->fBindFramebuffer = debugGLBindFramebuffer; functions->fBindRenderbuffer = debugGLBindRenderbuffer; -- cgit v1.2.3