From a9a430111290193028dc2b39be75c176d49d7bd3 Mon Sep 17 00:00:00 2001 From: "apatrick@chromium.org" Date: Fri, 5 Nov 2010 01:54:06 +0000 Subject: Revert 65152 - 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 TBR=apatrick@chromium.org Review URL: http://codereview.chromium.org/4561001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65169 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/demos/pepper_gpu_demo.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gpu/demos/pepper_gpu_demo.html') diff --git a/gpu/demos/pepper_gpu_demo.html b/gpu/demos/pepper_gpu_demo.html index 64d88f7..8be4e57 100644 --- a/gpu/demos/pepper_gpu_demo.html +++ b/gpu/demos/pepper_gpu_demo.html @@ -3,10 +3,10 @@ Pepper GPU Demo - +

Pepper GPU Demo

- -

Text on top

+ + -- cgit v1.1