diff options
author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 17:55:57 +0000 |
---|---|---|
committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 17:55:57 +0000 |
commit | 28638b2ce5ec96bda25fd3583d7902dea0137fb2 (patch) | |
tree | 585a58803f76da08e806524086f0948f7393b663 /gpu/command_buffer/service/gles2_cmd_decoder.h | |
parent | 74f275448f43dac31331495148e832c376b18344 (diff) | |
download | chromium_src-28638b2ce5ec96bda25fd3583d7902dea0137fb2.zip chromium_src-28638b2ce5ec96bda25fd3583d7902dea0137fb2.tar.gz chromium_src-28638b2ce5ec96bda25fd3583d7902dea0137fb2.tar.bz2 |
Implemented offscreen rendering path for GLES2CmdDecoder on Linux.
With these changes, WebGL runs in the sandbox on Linux.
BUG=29120
TEST=ran WebGL demos in sandbox on Linux
Review URL: http://codereview.chromium.org/1540004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43235 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/gles2_cmd_decoder.h')
-rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.h b/gpu/command_buffer/service/gles2_cmd_decoder.h index 58e1193..05951a2 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.h +++ b/gpu/command_buffer/service/gles2_cmd_decoder.h @@ -23,7 +23,7 @@ namespace gpu { // Forward-declared instead of including x_utils.h, because including glx.h // causes havok. -class XWindowWrapper; +class GLXContextWrapper; namespace gles2 { @@ -50,11 +50,11 @@ class GLES2Decoder : public CommonDecoder { } #if defined(OS_LINUX) - void set_window_wrapper(XWindowWrapper *window) { - window_ = window; + void set_context_wrapper(GLXContextWrapper *context) { + context_ = context; } - XWindowWrapper* window() const { - return window_; + GLXContextWrapper* context() const { + return context_; } #elif defined(OS_WIN) void set_hwnd(HWND hwnd) { @@ -108,7 +108,7 @@ class GLES2Decoder : public CommonDecoder { bool debug_; #if defined(OS_LINUX) - XWindowWrapper *window_; + GLXContextWrapper *context_; #elif defined(OS_WIN) // Handle to the GL device. HWND hwnd_; |