Changeset 113915 in webkit

Timestamp:

Apr 11, 2012, 3:12:37 PM (13 years ago)

Author:

zmo@google.com

Message:

WebGLRenderingContext should defer caching program info
​https://bugs.webkit.org/show_bug.cgi?id=83513

Reviewed by Kenneth Russell.

• html/canvas/WebGLProgram.cpp:

(WebCore::WebGLProgram::WebGLProgram):
(WebCore::WebGLProgram::numActiveAttribLocations): call cacheInfoIfNeeded();
(WebCore::WebGLProgram::getActiveAttribLocation): Ditto.
(WebCore::WebGLProgram::isUsingVertexAttrib0): Ditto.
(WebCore::WebGLProgram::getLinkStatus): Ditto.
(WebCore):
(WebCore::WebGLProgram::cacheActiveAttribLocations):
(WebCore::WebGLProgram::cacheInfoIfNeeded): Cache link status, active attire locations, etc if needed.
(WebCore::WebGLProgram::increaseLinkCount): also invalidate cached info.

• html/canvas/WebGLProgram.h:

(WebGLProgram):

• html/canvas/WebGLRenderingContext.cpp:

(WebCore):
(WebCore::WebGLRenderingContext::linkProgram): Do not cache program info immediately.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/canvas/WebGLProgram.cpp (modified) (5 diffs)
• html/canvas/WebGLProgram.h (modified) (4 diffs)
• html/canvas/WebGLRenderingContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-10  Zhenyao Mo  <zmo@google.com>
+
+        WebGLRenderingContext should defer caching program info
+        https://bugs.webkit.org/show_bug.cgi?id=83513
+
+        Reviewed by Kenneth Russell.
+
+        * html/canvas/WebGLProgram.cpp:
+        (WebCore::WebGLProgram::WebGLProgram):
+        (WebCore::WebGLProgram::numActiveAttribLocations): call cacheInfoIfNeeded();
+        (WebCore::WebGLProgram::getActiveAttribLocation): Ditto.
+        (WebCore::WebGLProgram::isUsingVertexAttrib0): Ditto.
+        (WebCore::WebGLProgram::getLinkStatus): Ditto.
+        (WebCore):
+        (WebCore::WebGLProgram::cacheActiveAttribLocations):
+        (WebCore::WebGLProgram::cacheInfoIfNeeded): Cache link status, active attire locations, etc if needed.
+        (WebCore::WebGLProgram::increaseLinkCount): also invalidate cached info.
+        * html/canvas/WebGLProgram.h:
+        (WebGLProgram):
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore):
+        (WebCore::WebGLRenderingContext::linkProgram): Do not cache program info immediately.
+
 2012-04-11  David Dorwin  <ddorwin@chromium.org>
 

trunk/Source/WebCore/html/canvas/WebGLProgram.cpp

@@ -44 +44 @@
     , m_linkStatus(false)
     , m_linkCount(0)
+    , m_infoValid(true)
 {
     setObject(ctx->graphicsContext3D()->createProgram());
@@ -66 +67 @@
 }
 
-bool WebGLProgram::cacheActiveAttribLocations(GraphicsContext3D* context3d)
+unsigned WebGLProgram::numActiveAttribLocations()
 {
-    m_activeAttribLocations.clear();
-    if (!object())
-        return false;
-
-    // Assume link status has already been cached.
-    if (!m_linkStatus)
-        return false;
-
-    GC3Dint numAttribs = 0;
-    context3d->getProgramiv(object(), GraphicsContext3D::ACTIVE_ATTRIBUTES, &numAttribs);
-    m_activeAttribLocations.resize(static_cast<size_t>(numAttribs));
-    for (int i = 0; i < numAttribs; ++i) {
-        ActiveInfo info;
-        context3d->getActiveAttrib(object(), i, info);
-        m_activeAttribLocations[i] = context3d->getAttribLocation(object(), info.name.charactersWithNullTermination());
-    }
-
-    return true;
-}
-
-unsigned WebGLProgram::numActiveAttribLocations() const
-{
+    cacheInfoIfNeeded();
     return m_activeAttribLocations.size();
 }
 
-GC3Dint WebGLProgram::getActiveAttribLocation(GC3Duint index) const
+GC3Dint WebGLProgram::getActiveAttribLocation(GC3Duint index)
 {
+    cacheInfoIfNeeded();
     if (index >= numActiveAttribLocations())
         return -1;
@@ -100 +81 @@
 }
 
-bool WebGLProgram::isUsingVertexAttrib0() const
+bool WebGLProgram::isUsingVertexAttrib0()
 {
+    cacheInfoIfNeeded();
     for (unsigned ii = 0; ii < numActiveAttribLocations(); ++ii) {
         if (!getActiveAttribLocation(ii))
@@ -107 +89 @@
     }
     return false;
+}
+
+bool WebGLProgram::getLinkStatus()
+{
+    cacheInfoIfNeeded();
+    return m_linkStatus;
+}
+
+void WebGLProgram::setLinkStatus(bool status)
+{
+    cacheInfoIfNeeded();
+    m_linkStatus = status;
+}
+
+void WebGLProgram::increaseLinkCount()
+{
+    ++m_linkCount;
+    m_infoValid = false;
 }
 
@@ -161 +161 @@
 }
 
+void WebGLProgram::cacheActiveAttribLocations(GraphicsContext3D* context3d)
+{
+    m_activeAttribLocations.clear();
+
+    GC3Dint numAttribs = 0;
+    context3d->getProgramiv(object(), GraphicsContext3D::ACTIVE_ATTRIBUTES, &numAttribs);
+    m_activeAttribLocations.resize(static_cast<size_t>(numAttribs));
+    for (int i = 0; i < numAttribs; ++i) {
+        ActiveInfo info;
+        context3d->getActiveAttrib(object(), i, info);
+        m_activeAttribLocations[i] = context3d->getAttribLocation(object(), info.name.charactersWithNullTermination());
+    }
+}
+
+void WebGLProgram::cacheInfoIfNeeded()
+{
+    if (m_infoValid)
+        return;
+
+    if (!object())
+        return;
+
+    GraphicsContext3D* context = getAGraphicsContext3D();
+    if (!context)
+        return;
+    GC3Dint linkStatus = 0;
+    context->getProgramiv(object(), GraphicsContext3D::LINK_STATUS, &linkStatus);
+    m_linkStatus = linkStatus;
+    if (m_linkStatus)
+        cacheActiveAttribLocations(context);
+    m_infoValid = true;
+}
+
 }
 

trunk/Source/WebCore/html/canvas/WebGLProgram.h

@@ -43 +43 @@
     static PassRefPtr<WebGLProgram> create(WebGLRenderingContext*);
 
-    // cacheActiveAttribLocation() is only called once after linkProgram()
-    // succeeds.
-    bool cacheActiveAttribLocations(GraphicsContext3D*);
-    unsigned numActiveAttribLocations() const;
-    GC3Dint getActiveAttribLocation(GC3Duint index) const;
+    unsigned numActiveAttribLocations();
+    GC3Dint getActiveAttribLocation(GC3Duint index);
 
-    bool isUsingVertexAttrib0() const;
+    bool isUsingVertexAttrib0();
 
-    bool getLinkStatus() const { return m_linkStatus; }
-    void setLinkStatus(bool status) { m_linkStatus = status; }
+    bool getLinkStatus();
+    void setLinkStatus(bool);
 
     unsigned getLinkCount() const { return m_linkCount; }
@@ -59 +56 @@
     // We don't deal with integer overflow here, assuming in reality a program
     // will never be linked so many times.
-    void increaseLinkCount() { ++m_linkCount; }
+    // Also, we invalidate the cached program info.
+    void increaseLinkCount();
 
     WebGLShader* getAttachedShader(GC3Denum);
@@ -73 +71 @@
     virtual bool isProgram() const { return true; }
 
+    void cacheActiveAttribLocations(GraphicsContext3D*);
+    void cacheInfoIfNeeded();
+
     Vector<GC3Dint> m_activeAttribLocations;
 
@@ -83 +84 @@
     RefPtr<WebGLShader> m_vertexShader;
     RefPtr<WebGLShader> m_fragmentShader;
+
+    bool m_infoValid;
 };
 

trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp

@@ -3140 +3140 @@
     m_context->linkProgram(objectOrZero(program));
     program->increaseLinkCount();
-    // cache link status
-    GC3Dint value = 0;
-    m_context->getProgramiv(objectOrZero(program), GraphicsContext3D::LINK_STATUS, &value);
-    program->setLinkStatus(static_cast<bool>(value));
-    // Need to cache link status before caching active attribute locations.
-    program->cacheActiveAttribLocations(graphicsContext3D());
     cleanupAfterGraphicsCall(false);
 }