From 55fe3d7748b873e362edc4e6a43bd77914ed25fb Mon Sep 17 00:00:00 2001 From: tomhudson Date: Mon, 24 Nov 2014 09:59:41 -0800 Subject: Revert of Add gpu support for Apple specific 'Vertex Arrays' functions (patchset #2 id:20001 of https://codereview.chromium.org/754653002/) Reason for revert: Suspected in DM crashes, e.g. 2033 tasks left 344M peak 843ms tabl-cuteoverload_skp Signal 11: _sigtramp (+0x1a) create_surface(CanvasConfig const&, GrContext*) (+0x1b2) test_WritePixels(skiatest::Reporter*, GrContextFactory*) (+0x8d4) skiatest::WritePixelsClass::onRun(skiatest::Reporter*) (+0x21) skiatest::Test::run() (+0x7c) DM::GpuTestTask::draw(GrContextFactory*) (+0x8c) DM::GpuTask::run(GrContextFactory*) (+0xa6) DM::TaskRunner::wait() (+0x7f) dm_main() (+0x33f) main (+0x27) On all MacMini platforms (the following URL with -Mac{10.6,10.7,10.8}- and -{Debug,Release}): http://build.chromium.org/p/client.skia/builders/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug Original issue's description: > Add gpu support for Apple specific 'Vertex Arrays' functions > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/af000f469e1b0153ce445c96ca3d20e6d12224cc TBR=bsalomon@google.com,paraboul@gmail.com NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/750973003 --- AUTHORS | 1 - src/gpu/gl/GrGLAssembleInterface.cpp | 4 ---- src/gpu/gl/GrGLCaps.cpp | 3 +-- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1b98402528..c36ea2c8e1 100644 --- a/AUTHORS +++ b/AUTHORS @@ -32,4 +32,3 @@ The Chromium Authors <*@chromium.org> Thiago Fransosi Farina Pavel Krajcevski Ion Rosca -Anthony Catel diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp index 25f9e161f4..425ed647c5 100644 --- a/src/gpu/gl/GrGLAssembleInterface.cpp +++ b/src/gpu/gl/GrGLAssembleInterface.cpp @@ -196,10 +196,6 @@ const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get) { GET_PROC(BindVertexArray); GET_PROC(GenVertexArrays); GET_PROC(DeleteVertexArrays); - } else if (extensions.has("GL_APPLE_vertex_array_object")) { - GET_PROC_SUFFIX(BindVertexArray, APPLE); - GET_PROC_SUFFIX(GenVertexArrays, APPLE); - GET_PROC_SUFFIX(DeleteVertexArrays, APPLE); } if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_map_buffer_range")) { diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 414f06d6ae..6272aba127 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -235,8 +235,7 @@ bool GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) { if (kGL_GrGLStandard == standard) { fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) || - ctxInfo.hasExtension("GL_ARB_vertex_array_object") || - ctxInfo.hasExtension("GL_APPLE_vertex_array_object"); + ctxInfo.hasExtension("GL_ARB_vertex_array_object"); } else { fVertexArrayObjectSupport = version >= GR_GL_VER(3, 0) || ctxInfo.hasExtension("GL_OES_vertex_array_object"); -- cgit v1.2.3