diff options
| author | amarinichev@chromium.org <amarinichev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 20:21:35 +0000 |
|---|---|---|
| committer | amarinichev@chromium.org <amarinichev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-03 20:21:35 +0000 |
| commit | a381412e8ea34d81454c47c370c862621d42f57e (patch) | |
| tree | de2b4c2ff559f13052525e5e84939a58d3b686dd /o3d/core | |
| parent | d360e6dbde013acffb9754000d9bfc265902d767 (diff) | |
| download | chromium_src-a381412e8ea34d81454c47c370c862621d42f57e.zip chromium_src-a381412e8ea34d81454c47c370c862621d42f57e.tar.gz chromium_src-a381412e8ea34d81454c47c370c862621d42f57e.tar.bz2 | |
Fixed renderer_test.cc for GLES2.
Review URL: http://codereview.chromium.org/1830004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/core')
| -rw-r--r-- | o3d/core/cross/gles2/renderer_gles2.h | 6 | ||||
| -rw-r--r-- | o3d/core/cross/renderer_test.cc | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/o3d/core/cross/gles2/renderer_gles2.h b/o3d/core/cross/gles2/renderer_gles2.h index 6036c73..30ca3ed 100644 --- a/o3d/core/cross/gles2/renderer_gles2.h +++ b/o3d/core/cross/gles2/renderer_gles2.h @@ -182,6 +182,12 @@ class RendererGLES2 : public Renderer { // Programs the helper constants into the hardware. void UpdateDxClippingUniform(GLint location); +#if defined(GLES2_BACKEND_DESKTOP_GL) + inline GLXContext glx_context() const { return context_; } +#elif defined(GLES2_BACKEND_NATIVE_GLES2) + inline EGLContext egl_context() const { return egl_context_; } +#endif + protected: // Keep the constructor protected so only factory methods can create // renderers. diff --git a/o3d/core/cross/renderer_test.cc b/o3d/core/cross/renderer_test.cc index 427777f..a73ec2f 100644 --- a/o3d/core/cross/renderer_test.cc +++ b/o3d/core/cross/renderer_test.cc @@ -105,6 +105,11 @@ TEST_F(RendererTest, InitAndDestroyRenderer) { // check that the renderer no longer has a Cg Context. EXPECT_FALSE(gl_renderer->cg_context() != NULL); #elif defined(RENDERER_GLES2) +#if defined(GLES2_BACKEND_DESKTOP_GL) + EXPECT_FALSE(gles2_renderer->glx_context() != NULL); +#elif defined(GLES2_BACKEND_NATIVE_GLES2) + EXPECT_FALSE(gles2_renderer->egl_context() != NULL); +#endif #endif } |