summaryrefslogtreecommitdiffstats
path: root/cc/test/test_context_provider.h
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-08 22:14:11 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-08 22:14:11 +0000
commita99d82fff6f153284981a7c44b2f9303de31e012 (patch)
treeca979dfb00ce009718da7f837b13a3cdc7eaf118 /cc/test/test_context_provider.h
parent18aa701dea5ef746a52ef43ee7f209abedb78182 (diff)
downloadchromium_src-a99d82fff6f153284981a7c44b2f9303de31e012.zip
chromium_src-a99d82fff6f153284981a7c44b2f9303de31e012.tar.gz
chromium_src-a99d82fff6f153284981a7c44b2f9303de31e012.tar.bz2
Use GLES2Interface for shaders and programs
This uses the gpu::gles2::GLES2Interface type in the gl renderer's shader and program code instead of WebGraphicsContext3D. For production code, the GLES2Interface is a direct interface to the real command buffer in use. For cc_unittests, the GLES2Interface is a stub that wraps TestWebGraphicsContext3D so we can continue to use the same stubs/mocks for now. Once we port all of the production code over to using GLES2Interface we should port the test context classes over to the new base interface. BUG=181120 Review URL: https://codereview.chromium.org/93433004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/test_context_provider.h')
-rw-r--r--cc/test/test_context_provider.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/test/test_context_provider.h b/cc/test/test_context_provider.h
index 6997f85..1f086001 100644
--- a/cc/test/test_context_provider.h
+++ b/cc/test/test_context_provider.h
@@ -17,6 +17,7 @@ namespace blink { class WebGraphicsContext3D; }
namespace cc {
class TestWebGraphicsContext3D;
+class TestGLES2Interface;
class TestContextProvider : public cc::ContextProvider {
public:
@@ -66,7 +67,7 @@ class TestContextProvider : public cc::ContextProvider {
TestContextSupport support_;
scoped_ptr<TestWebGraphicsContext3D> context3d_;
- gpu::gles2::GLES2InterfaceStub context_gl_stub_;
+ scoped_ptr<TestGLES2Interface> context_gl_;
bool bound_;
base::ThreadChecker main_thread_checker_;