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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc

Issue 2629633003: Refactor GL bindings so there is no global GLApi or DriverGL. (Closed)
Patch Set: rebase Created 3 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: gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
index 3600c1982174487819c473945e8932e43d382b19..fbad893fcf5980c46e381231db12982031d7eb5d 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
@@ -3398,7 +3398,7 @@ TEST_P(GLES2DecoderManualInitTest, InvalidateFramebufferBinding) {
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
reinterpret_cast<gl::GLFunctionPointerType>(
- gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
+ gl::g_current_gl_driver->fn.glDiscardFramebufferEXTFn));
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT"));
@@ -3449,7 +3449,7 @@ TEST_P(GLES2DecoderManualInitTest, DiscardFramebufferEXT) {
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
reinterpret_cast<gl::GLFunctionPointerType>(
- gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
+ gl::g_current_gl_driver->fn.glDiscardFramebufferEXTFn));
const GLenum target = GL_FRAMEBUFFER;
const GLsizei count = 1;
@@ -3492,7 +3492,7 @@ TEST_P(GLES2DecoderManualInitTest, ClearBackbufferBitsOnDiscardFramebufferEXT) {
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
reinterpret_cast<gl::GLFunctionPointerType>(
- gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
+ gl::g_current_gl_driver->fn.glDiscardFramebufferEXTFn));
const GLenum target = GL_FRAMEBUFFER;
const GLsizei count = 1;
@@ -3716,7 +3716,7 @@ TEST_P(GLES2DecoderManualInitTest,
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
reinterpret_cast<gl::GLFunctionPointerType>(
- gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
+ gl::g_current_gl_driver->fn.glDiscardFramebufferEXTFn));
const GLenum target = GL_FRAMEBUFFER;
const GLsizei count = 1;
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc ('k') | gpu/command_buffer/service/gpu_service_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698