Changeset 61406 in webkit

Timestamp:

Jun 18, 2010 8:14:10 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-18 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

Fix WebGLRenderingContext helper functions find{Texture/Renderbuffer/Buffer}
​https://bugs.webkit.org/show_bug.cgi?id=40176

• fast/canvas/webgl/gl-object-get-calls-expected.txt: Test name == 0 cases, and test getVertexAttrib return original WebGLBuffer object.
• fast/canvas/webgl/script-tests/gl-object-get-calls.js: Ditto.

2010-06-18 Zhenyao Mo <​zmo@google.com>

Reviewed by Dimitri Glazkov.

Fix WebGLRenderingContext helper functions find{Texture/Renderbuffer/Buffer}
​https://bugs.webkit.org/show_bug.cgi?id=40176

• html/canvas/WebGLBuffer.cpp: Remove constructor with existing name.
• html/canvas/WebGLBuffer.h: Ditto.
• html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::getVertexAttrib): Use findBuffer instead of creating a new WebGLBuffer. (WebCore::WebGLRenderingContext::findTexture): Deal with name == 0 case and return raw pointer. (WebCore::WebGLRenderingContext::findRenderbuffer): Ditto. (WebCore::WebGLRenderingContext::findBuffer): Find WebGLBuffer object using given name.
• html/canvas/WebGLRenderingContext.h: Add findBuffer function declaration, change return type to raw pointer.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt (modified) (2 diffs)
• LayoutTests/fast/canvas/webgl/script-tests/gl-object-get-calls.js (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/canvas/WebGLBuffer.cpp (modified) (2 diffs)
• WebCore/html/canvas/WebGLBuffer.h (modified) (2 diffs)
• WebCore/html/canvas/WebGLRenderingContext.cpp (modified) (3 diffs)
• WebCore/html/canvas/WebGLRenderingContext.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-18  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix WebGLRenderingContext helper functions find{Texture/Renderbuffer/Buffer}
+        https://bugs.webkit.org/show_bug.cgi?id=40176
+
+        * fast/canvas/webgl/gl-object-get-calls-expected.txt: Test name == 0 cases, and test getVertexAttrib return original WebGLBuffer object.
+        * fast/canvas/webgl/script-tests/gl-object-get-calls.js: Ditto.
+
 2010-06-18  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt

@@ -70 +70 @@
 PASS gl.getUniform(matProgram, mval3Loc) is [5, 6, 7, 8, 9, 10, 11, 12, 13]
 PASS gl.getUniform(matProgram, mval4Loc) is [14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29]
-PASS gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING) is non-null.
+PASS gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING) is buffer
 PASS gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_ENABLED) is true
 PASS gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_SIZE) is 4
@@ -79 +79 @@
 PASS gl.getVertexAttrib(1, gl.CURRENT_VERTEX_ATTRIB) is [5, 6, 7, 8]
 PASS gl.getError() is 0
+PASS gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) is null
+PASS gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) is null
+PASS gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING) is null
+PASS gl.getError() is 0
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/canvas/webgl/script-tests/gl-object-get-calls.js

@@ -193 +193 @@
 gl.enableVertexAttribArray(1);
 gl.vertexAttribPointer(1, 4, gl.FLOAT, false, 0, 0);
-shouldBeNonNull('gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING)');
+shouldBe('gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING)', 'buffer');
 shouldBe('gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_ENABLED)', 'true');
 shouldBe('gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_SIZE)', '4');
@@ -205 +205 @@
 shouldBe('gl.getError()', '0');
 
+// Test cases where name == 0
+gl.deleteTexture(texture);
+shouldBeNull('gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME)');
+gl.deleteRenderbuffer(renderbuffer);
+shouldBeNull('gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.DEPTH_ATTACHMENT, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_NAME)');
+gl.deleteBuffer(buffer);
+shouldBeNull('gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING)');
+shouldBe('gl.getError()', '0');
+
 successfullyParsed = true;

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-18  Zhenyao Mo  <zmo@google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix WebGLRenderingContext helper functions find{Texture/Renderbuffer/Buffer}
+        https://bugs.webkit.org/show_bug.cgi?id=40176
+
+        * html/canvas/WebGLBuffer.cpp: Remove constructor with existing name.
+        * html/canvas/WebGLBuffer.h: Ditto.
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::getVertexAttrib): Use findBuffer instead of creating a new WebGLBuffer.
+        (WebCore::WebGLRenderingContext::findTexture): Deal with name == 0 case and return raw pointer.
+        (WebCore::WebGLRenderingContext::findRenderbuffer): Ditto.
+        (WebCore::WebGLRenderingContext::findBuffer): Find WebGLBuffer object using given name.
+        * html/canvas/WebGLRenderingContext.h: Add findBuffer function declaration, change return type to raw pointer.
+
 2010-06-18  Tony Gentilcore  <tonyg@chromium.org>
 

trunk/WebCore/html/canvas/WebGLBuffer.cpp

@@ -38 +38 @@
 }
 
-PassRefPtr<WebGLBuffer> WebGLBuffer::create(WebGLRenderingContext* ctx, Platform3DObject obj)
-{
-    return adoptRef(new WebGLBuffer(ctx, obj));
-}
-
 WebGLBuffer::WebGLBuffer(WebGLRenderingContext* ctx)
     : CanvasObject(ctx)
@@ -50 +45 @@
 {
     setObject(context()->graphicsContext3D()->createBuffer());
-    clearCachedMaxIndices();
-}
-
-WebGLBuffer::WebGLBuffer(WebGLRenderingContext* ctx, Platform3DObject obj)
-    : CanvasObject(ctx)
-    , m_nextAvailableCacheEntry(0)
-{
-    setObject(obj, false);
     clearCachedMaxIndices();
 }

trunk/WebCore/html/canvas/WebGLBuffer.h

@@ -40 +40 @@
         
         static PassRefPtr<WebGLBuffer> create(WebGLRenderingContext*);
-        
-        // For querying previously created objects via e.g. getFramebufferAttachmentParameter
-        // FIXME: should consider canonicalizing these objects
-        static PassRefPtr<WebGLBuffer> create(WebGLRenderingContext*, Platform3DObject);
 
         bool associateBufferData(unsigned long target, int size);
@@ -60 +56 @@
     protected:
         WebGLBuffer(WebGLRenderingContext*);
-        WebGLBuffer(WebGLRenderingContext*, Platform3DObject obj);
-        
+
         virtual void _deleteObject(Platform3DObject o);
     

trunk/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -1117 +1117 @@
         switch (type) {
         case GraphicsContext3D::RENDERBUFFER:
-            return WebGLGetInfo(findRenderbuffer(static_cast<Platform3DObject>(value)));
+            return WebGLGetInfo(PassRefPtr<WebGLRenderbuffer>(findRenderbuffer(static_cast<Platform3DObject>(value))));
         case GraphicsContext3D::TEXTURE:
-            return WebGLGetInfo(findTexture(static_cast<Platform3DObject>(value)));
+            return WebGLGetInfo(PassRefPtr<WebGLTexture>(findTexture(static_cast<Platform3DObject>(value))));
         default:
             // FIXME: raise exception?
@@ -1602 +1602 @@
         int name = 0;
         m_context->getVertexAttribiv(index, pname, &name);
-        if (name == 0)
-            return WebGLGetInfo();
-        RefPtr<WebGLBuffer> tmp = WebGLBuffer::create(this, name);
-        addObject(tmp.get());
-        return WebGLGetInfo(PassRefPtr<WebGLBuffer>(tmp));
+        return WebGLGetInfo(PassRefPtr<WebGLBuffer>(findBuffer(static_cast<Platform3DObject>(name))));
     }
     case GraphicsContext3D::VERTEX_ATTRIB_ARRAY_ENABLED:
@@ -3141 +3137 @@
 }
 
-PassRefPtr<WebGLTexture> WebGLRenderingContext::findTexture(Platform3DObject obj)
-{
+WebGLTexture* WebGLRenderingContext::findTexture(Platform3DObject obj)
+{
+    if (!obj)
+        return 0;
     HashSet<RefPtr<CanvasObject> >::iterator pend = m_canvasObjects.end();
     for (HashSet<RefPtr<CanvasObject> >::iterator it = m_canvasObjects.begin(); it != pend; ++it) {
-        if ((*it)->isTexture() && (*it)->object() == obj) {
-            RefPtr<WebGLTexture> tex = reinterpret_cast<WebGLTexture*>((*it).get());
-            return tex.release();
-        }
+        if ((*it)->isTexture() && (*it)->object() == obj)
+            return reinterpret_cast<WebGLTexture*>((*it).get());
     }
     return 0;
 }
 
-PassRefPtr<WebGLRenderbuffer> WebGLRenderingContext::findRenderbuffer(Platform3DObject obj)
-{
+WebGLRenderbuffer* WebGLRenderingContext::findRenderbuffer(Platform3DObject obj)
+{
+    if (!obj)
+        return 0;
     HashSet<RefPtr<CanvasObject> >::iterator pend = m_canvasObjects.end();
     for (HashSet<RefPtr<CanvasObject> >::iterator it = m_canvasObjects.begin(); it != pend; ++it) {
-        if ((*it)->isRenderbuffer() && (*it)->object() == obj) {
-            RefPtr<WebGLRenderbuffer> buffer = reinterpret_cast<WebGLRenderbuffer*>((*it).get());
-            return buffer.release();
-        }
+        if ((*it)->isRenderbuffer() && (*it)->object() == obj)
+            return reinterpret_cast<WebGLRenderbuffer*>((*it).get());
+    }
+    return 0;
+}
+
+WebGLBuffer* WebGLRenderingContext::findBuffer(Platform3DObject obj)
+{
+    if (!obj)
+        return 0;
+    HashSet<RefPtr<CanvasObject> >::iterator pend = m_canvasObjects.end();
+    for (HashSet<RefPtr<CanvasObject> >::iterator it = m_canvasObjects.begin(); it != pend; ++it) {
+        if ((*it)->isBuffer() && (*it)->object() == obj)
+            return reinterpret_cast<WebGLBuffer*>((*it).get());
     }
     return 0;

trunk/WebCore/html/canvas/WebGLRenderingContext.h

@@ -316 +316 @@
         void addObject(CanvasObject*);
         void detachAndRemoveAllObjects();
-        PassRefPtr<WebGLTexture> findTexture(Platform3DObject);
-        PassRefPtr<WebGLRenderbuffer> findRenderbuffer(Platform3DObject);
+        WebGLTexture* findTexture(Platform3DObject);
+        WebGLRenderbuffer* findRenderbuffer(Platform3DObject);
+        WebGLBuffer* findBuffer(Platform3DObject);
 
         void markContextChanged();