summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 21:37:12 +0000
committerboliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 21:37:12 +0000
commit6d66889e60c2ed2f6da8affb7399bba857c6dc30 (patch)
treec83f6c8166446d1307c49d8e4811d5063e313839 /ppapi
parentf32c2fdc3019a766f9fa8a79ba11528e036cef97 (diff)
downloadchromium_src-6d66889e60c2ed2f6da8affb7399bba857c6dc30.zip
chromium_src-6d66889e60c2ed2f6da8affb7399bba857c6dc30.tar.gz
chromium_src-6d66889e60c2ed2f6da8affb7399bba857c6dc30.tar.bz2
Introduce gpu::Capabilities
gpu::Capabilities is a subset of FeatureInfo that is exposed to the command buffer client. It is populated in GlES2Implementation::Initialize, piggy-backing on the synchronous init ipc. Make ContextProviderInProcess use gpu::Capabilities as well instead of hardcoding them. Merged GpuControl::SupportsGpuMemoryBuffer into capabilities. BUG=285390 Review URL: https://codereview.chromium.org/73263003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppapi_command_buffer_proxy.cc6
-rw-r--r--ppapi/proxy/ppapi_command_buffer_proxy.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc
index 063cafb..5c2642d 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc
@@ -218,8 +218,10 @@ void PpapiCommandBufferProxy::SendManagedMemoryStats(
NOTREACHED();
}
-bool PpapiCommandBufferProxy::SupportsGpuMemoryBuffer() {
- return false;
+gpu::Capabilities PpapiCommandBufferProxy::GetCapabilities() {
+ // TODO(boliu): Need to implement this to use cc in Pepper. Tracked in
+ // crbug.com/325391.
+ return gpu::Capabilities();
}
gfx::GpuMemoryBuffer* PpapiCommandBufferProxy::CreateGpuMemoryBuffer(
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h
index bca5190..94e2582 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.h
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.h
@@ -47,7 +47,7 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy
OVERRIDE;
// gpu::GpuControl implementation:
- virtual bool SupportsGpuMemoryBuffer() OVERRIDE;
+ virtual gpu::Capabilities GetCapabilities() OVERRIDE;
virtual gfx::GpuMemoryBuffer* CreateGpuMemoryBuffer(
size_t width,
size_t height,