Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Unified Diff: ui/gl/gl_gl_api_implementation.cc

Issue 145293007: ui: No more TestCompositor. Use NullDraw contexts in unit tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: testsnulldraw: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gl/gl_gl_api_implementation.cc
diff --git a/ui/gl/gl_gl_api_implementation.cc b/ui/gl/gl_gl_api_implementation.cc
index 1f9a06d0ae29c0dcd29b272125e9973f9efa2ed1..143dfb84aa1b78db889b698b97b1ce99936da167 100644
--- a/ui/gl/gl_gl_api_implementation.cc
+++ b/ui/gl/gl_gl_api_implementation.cc
@@ -180,6 +180,51 @@ void DriverGL::InitializeCustomDynamicBindings(GLContext* context) {
CustomRenderbufferStorageMultisampleEXT);
}
+static void GL_BINDING_CALL NullDrawClearFn(GLbitfield mask) {
+ if (!g_driver_gl.null_draw_bindings_enabled)
+ g_driver_gl.orig_fn.glClearFn(mask);
+}
+
+static void GL_BINDING_CALL
+NullDrawDrawArraysFn(GLenum mode, GLint first, GLsizei count) {
+ if (!g_driver_gl.null_draw_bindings_enabled)
+ g_driver_gl.orig_fn.glDrawArraysFn(mode, first, count);
+}
+
+static void GL_BINDING_CALL NullDrawDrawElementsFn(GLenum mode,
+ GLsizei count,
+ GLenum type,
+ const void* indices) {
+ if (!g_driver_gl.null_draw_bindings_enabled)
+ g_driver_gl.orig_fn.glDrawElementsFn(mode, count, type, indices);
+}
+
+void DriverGL::InitializeNullDrawBindings() {
+ DCHECK(orig_fn.glClearFn == NULL);
+ orig_fn.glClearFn = fn.glClearFn;
+ fn.glClearFn = NullDrawClearFn;
+
+ DCHECK(orig_fn.glDrawArraysFn == NULL);
+ orig_fn.glDrawArraysFn = fn.glDrawArraysFn;
+ fn.glDrawArraysFn = NullDrawDrawArraysFn;
+
+ DCHECK(orig_fn.glDrawElementsFn == NULL);
+ orig_fn.glDrawElementsFn = fn.glDrawElementsFn;
+ fn.glDrawElementsFn = NullDrawDrawElementsFn;
+
+ null_draw_bindings_enabled = true;
+}
+
+bool DriverGL::SetNullDrawBindingsEnabled(bool enabled) {
+ DCHECK(orig_fn.glClearFn != NULL);
+ DCHECK(orig_fn.glDrawArraysFn != NULL);
+ DCHECK(orig_fn.glDrawElementsFn != NULL);
+
+ bool before = null_draw_bindings_enabled;
+ null_draw_bindings_enabled = enabled;
+ return before;
+}
+
void InitializeStaticGLBindingsGL() {
g_current_gl_context_tls = new base::ThreadLocalPointer<GLApi>;
g_driver_gl.InitializeStaticBindings();
@@ -220,6 +265,10 @@ void InitializeNullDrawGLBindingsGL() {
g_driver_gl.InitializeNullDrawBindings();
}
+bool SetNullDrawGLBindingsEnabledGL(bool enabled) {
+ return g_driver_gl.SetNullDrawBindingsEnabled(enabled);
+}
+
void ClearGLBindingsGL() {
if (g_real_gl) {
delete g_real_gl;

Powered by Google App Engine
This is Rietveld 408576698