summaryrefslogtreecommitdiffstats
path: root/gpu/demos/demos.gyp
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 00:36:12 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-05 00:36:12 +0000
commitc4cacf1429f06bac025d8c0337c3b80efa8f98a9 (patch)
tree413e05bba0fe58c7b85aea19d2391ee185257fd0 /gpu/demos/demos.gyp
parentfc24838c909913960402b1c75926e9372af595b8 (diff)
downloadchromium_src-c4cacf1429f06bac025d8c0337c3b80efa8f98a9.zip
chromium_src-c4cacf1429f06bac025d8c0337c3b80efa8f98a9.tar.gz
chromium_src-c4cacf1429f06bac025d8c0337c3b80efa8f98a9.tar.bz2
Integrated Pepper3D v2 with the accelerated compositor.
- It now uses GGL instead of a child window. - Fixed a bug where GLES2 decoder set texture state without updating TextureInfo. - Fixed Pepper3D demos and added awesome 3D CSS programmer art. - Removed ggl::GetCurrentContext to prevent further abuse. Fixed said abuse :) - GGL exposes GLES2Implementation to allow issue of GL calls on a particular context without making that context globally current. - Removed redundant "this context" argument from GGL SwapBuffers completion callback. - Temporarily removed context lost notification. I need to figure out the best semantics. TEST=Run Pepper3D and WebGL demos and YouTube videos on Windows and Mac. BUG=none Review URL: http://codereview.chromium.org/3531008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/demos/demos.gyp')
-rw-r--r--gpu/demos/demos.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp
index d205eea..bae7503 100644
--- a/gpu/demos/demos.gyp
+++ b/gpu/demos/demos.gyp
@@ -156,7 +156,6 @@
['OS=="mac"', {
'action': [
'<(PRODUCT_DIR)/Chromium.app/Contents/MacOS/Chromium',
- '--enable-gpu-plugin',
'--register-pepper-plugins='
'<(PRODUCT_DIR)/$(PRODUCT_NAME).plugin;'
'pepper-application/x-gpu-demo',
@@ -165,7 +164,6 @@
}, { # OS != "mac"
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
- '--enable-gpu-plugin',
'--register-pepper-plugins=$(TargetPath);'
'pepper-application/x-gpu-demo',
'file://$(ProjectDir)pepper_gpu_demo.html',