Changeset 105462 in webkit

Timestamp:

Jan 19, 2012 4:29:30 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Replace WGC3D visibility extension with resource_usage extension. [Part 1 of 3]
​https://bugs.webkit.org/show_bug.cgi?id=76634

Patch by Michal Mocny <​mmocny@google.com> on 2012-01-19
Reviewed by Kenneth Russell.

• public/platform/WebGraphicsContext3D.h:

(WebKit::WebGraphicsContext3D::setVisibilityCHROMIUM):
(WebKit::WebGraphicsContext3D::setResourceUsageCHROMIUM):

• src/GraphicsContext3DChromium.cpp:

(WebCore::GraphicsContext3DPrivate::setVisibilityCHROMIUM):

• tests/FakeWebGraphicsContext3D.h:

(WebKit::FakeWebGraphicsContext3D::setResourceUsageCHROMIUM):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/platform/WebGraphicsContext3D.h (modified) (2 diffs)
• src/GraphicsContext3DChromium.cpp (modified) (2 diffs)
• tests/FakeWebGraphicsContext3D.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-01-19  Michal Mocny  <mmocny@google.com>
+
+        [chromium] Replace WGC3D visibility extension with resource_usage extension. [Part 1 of 3]
+        https://bugs.webkit.org/show_bug.cgi?id=76634
+
+        Reviewed by Kenneth Russell.
+
+        * public/platform/WebGraphicsContext3D.h:
+        (WebKit::WebGraphicsContext3D::setVisibilityCHROMIUM):
+        (WebKit::WebGraphicsContext3D::setResourceUsageCHROMIUM):
+        * src/GraphicsContext3DChromium.cpp:
+        (WebCore::GraphicsContext3DPrivate::setVisibilityCHROMIUM):
+        * tests/FakeWebGraphicsContext3D.h:
+        (WebKit::FakeWebGraphicsContext3D::setResourceUsageCHROMIUM):
+
 2012-01-19  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h

@@ -125 +125 @@
     };
 
+    // Graphics Resource Usage
+    enum ResourceUsage {
+        RESOURCE_USAGE_FULL,
+        RESOURCE_USAGE_LESS,
+        RESOURCE_USAGE_NONE,
+    };
+
     // This destructor needs to be public so that using classes can destroy instances if initialization fails.
     virtual ~WebGraphicsContext3D() {}
@@ -144 +151 @@
     virtual void reshape(int width, int height) = 0;
 
-    // GL_CHROMIUM_setVisibility - Changes the visibility of the backbuffer
-    virtual void setVisibilityCHROMIUM(bool visible) = 0;
+    // GL_CHROMIUM_resource_usage - use/drop various resources, such as front/back buffers
+    // TODO(mmocny): remove visibility once chromium patch lands
+    virtual void setVisibilityCHROMIUM(bool visible) { }
+    virtual void setResourceUsageCHROMIUM(ResourceUsage) { }
 
     // Query whether it is built on top of compliant GLES2 implementation.

trunk/Source/WebKit/chromium/src/GraphicsContext3DChromium.cpp

@@ -892 +892 @@
 }
 
+void GraphicsContext3DPrivate::setVisibilityCHROMIUM(bool visibility)
+{
+    // TODO(mmocny): remove visibility once chromium patch lands
+    m_impl->setVisibilityCHROMIUM(visibility);
+    m_impl->setResourceUsageCHROMIUM(visibility ? WebKit::WebGraphicsContext3D::RESOURCE_USAGE_FULL : WebKit::WebGraphicsContext3D::RESOURCE_USAGE_LESS);
+}
+
 DELEGATE_TO_IMPL_4(postSubBufferCHROMIUM, int, int, int, int)
 
@@ -898 +905 @@
 DELEGATE_TO_IMPL_9R(mapTexSubImage2DCHROMIUM, GC3Denum, GC3Dint, GC3Dint, GC3Dint, GC3Dsizei, GC3Dsizei, GC3Denum, GC3Denum, GC3Denum, void*)
 DELEGATE_TO_IMPL_1(unmapTexSubImage2DCHROMIUM, const void*)
-
-DELEGATE_TO_IMPL_1(setVisibilityCHROMIUM, bool);
 
 DELEGATE_TO_IMPL_10(blitFramebufferCHROMIUM, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dint, GC3Dbitfield, GC3Denum)

trunk/Source/WebKit/chromium/tests/FakeWebGraphicsContext3D.h

@@ -64 +64 @@
     virtual void unmapTexSubImage2DCHROMIUM(const void*) { }
 
-    virtual void setVisibilityCHROMIUM(bool visible) { }
+    virtual void setResourceUsageCHROMIUM(ResourceUsage) { }
 
     virtual WebString getRequestableExtensionsCHROMIUM() { return WebString(); }