Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: third_party/WebKit/Source/modules/webgl/WebGLBuffer.cpp

Issue 1817323003: Revert of Remove create/delete methods from WebGraphicsContext3D. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@complex-casts
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "modules/webgl/WebGLBuffer.h" 26 #include "modules/webgl/WebGLBuffer.h"
27 27
28 #include "gpu/command_buffer/client/gles2_interface.h"
29 #include "modules/webgl/WebGLRenderingContextBase.h" 28 #include "modules/webgl/WebGLRenderingContextBase.h"
30 29
31 namespace blink { 30 namespace blink {
32 31
33 WebGLBuffer* WebGLBuffer::create(WebGLRenderingContextBase* ctx) 32 WebGLBuffer* WebGLBuffer::create(WebGLRenderingContextBase* ctx)
34 { 33 {
35 return new WebGLBuffer(ctx); 34 return new WebGLBuffer(ctx);
36 } 35 }
37 36
38 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx) 37 WebGLBuffer::WebGLBuffer(WebGLRenderingContextBase* ctx)
39 : WebGLSharedPlatform3DObject(ctx) 38 : WebGLSharedPlatform3DObject(ctx)
40 , m_initialTarget(0) 39 , m_initialTarget(0)
41 , m_size(0) 40 , m_size(0)
42 { 41 {
43 GLuint buffer; 42 setObject(ctx->webContext()->createBuffer());
44 ctx->contextGL()->GenBuffers(1, &buffer);
45 setObject(buffer);
46 } 43 }
47 44
48 WebGLBuffer::~WebGLBuffer() 45 WebGLBuffer::~WebGLBuffer()
49 { 46 {
50 // See the comment in WebGLObject::detachAndDeleteObject(). 47 // See the comment in WebGLObject::detachAndDeleteObject().
51 detachAndDeleteObject(); 48 detachAndDeleteObject();
52 } 49 }
53 50
54 void WebGLBuffer::deleteObjectImpl(WebGraphicsContext3D* context3d, gpu::gles2:: GLES2Interface* gl) 51 void WebGLBuffer::deleteObjectImpl(WebGraphicsContext3D* context3d, gpu::gles2:: GLES2Interface* gl)
55 { 52 {
56 gl->DeleteBuffers(1, &m_object); 53 context3d->deleteBuffer(m_object);
57 m_object = 0; 54 m_object = 0;
58 } 55 }
59 56
60 void WebGLBuffer::setInitialTarget(GLenum target) 57 void WebGLBuffer::setInitialTarget(GLenum target)
61 { 58 {
62 // WebGL restricts the ability to bind buffers to multiple targets based on 59 // WebGL restricts the ability to bind buffers to multiple targets based on
63 // it's initial bind point. 60 // it's initial bind point.
64 ASSERT(!m_initialTarget); 61 ASSERT(!m_initialTarget);
65 m_initialTarget = target; 62 m_initialTarget = target;
66 } 63 }
67 64
68 } // namespace blink 65 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698