diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 20:20:38 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-09 20:20:38 +0000 |
| commit | f5d8e157ff32700d247e2422dc8b2b0631e63105 (patch) | |
| tree | d9134f7a0735a0eafc8c6a46e892de303bf5d407 /o3d/core/cross/renderer.h | |
| parent | 642a6989c4454627a22225a81080c4fcdee986df (diff) | |
| download | chromium_src-f5d8e157ff32700d247e2422dc8b2b0631e63105.zip chromium_src-f5d8e157ff32700d247e2422dc8b2b0631e63105.tar.gz chromium_src-f5d8e157ff32700d247e2422dc8b2b0631e63105.tar.bz2 | |
Revert 58946 - Further integration of 2D mode. This change supports calltype=v, transparancy, and image transformation.
Currently only support Linux and compiled when renderer = cairo.
TEST= I compiled with renderer = cairo and it worked. Also I compiled with renderer = gl and it worked.
BUG=none
Review URL: http://codereview.chromium.org/3272003
TBR=fransiskusx@google.com
Review URL: http://codereview.chromium.org/3366019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core/cross/renderer.h')
| -rw-r--r-- | o3d/core/cross/renderer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/o3d/core/cross/renderer.h b/o3d/core/cross/renderer.h index 7a35415..3be95f4 100644 --- a/o3d/core/cross/renderer.h +++ b/o3d/core/cross/renderer.h @@ -298,10 +298,10 @@ class Renderer { ParamCache* param_cache); // Pushes rendering states. - virtual void PushRenderStates(State *state); + void PushRenderStates(State *state); // Pops rendering states to back to their previous settings. - virtual void PopRenderStates(); + void PopRenderStates(); // Binds the passed surfaces to the color and depth buffers of the // renderer. |