From 4286a006bf067a3a6dbef4a3ec1708416c3e9ad3 Mon Sep 17 00:00:00 2001 From: "gman@chromium.org" Date: Wed, 8 Feb 2012 01:47:07 +0000 Subject: Fix OpenGL ES 2.0 conformance test support TEST=ran OpenGL ES 2.0 conformance tests BUG=none R=apatrick@chromium.org Review URL: http://codereview.chromium.org/9307045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120900 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/gles2_conform_support/egl/display.cc | 3 ++- gpu/gles2_conform_support/gles2_conform_support.gyp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'gpu') diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc index 1b540f4..bfbdfef 100644 --- a/gpu/gles2_conform_support/egl/display.cc +++ b/gpu/gles2_conform_support/egl/display.cc @@ -181,8 +181,8 @@ EGLContext Display::CreateContext(EGLConfig config, true)); if (!context_->Initialize( - kTransferBufferSize / 2, kTransferBufferSize, + kTransferBufferSize / 2, kTransferBufferSize * 2)) { return EGL_NO_CONTEXT; } @@ -196,6 +196,7 @@ EGLContext Display::CreateContext(EGLConfig config, void Display::DestroyContext(EGLContext ctx) { DCHECK(IsValidContext(ctx)); context_.reset(); + transfer_buffer_.reset(); } bool Display::MakeCurrent(EGLSurface draw, EGLSurface read, EGLContext ctx) { diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index 2341657..2bb3af2 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -31,7 +31,7 @@ 'type': 'static_library', 'dependencies': [ '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', + '<(DEPTH)/gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check', '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', ], 'include_dirs': ['<(DEPTH)/third_party/khronos'], -- cgit v1.1