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

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

Issue 2588263005: Change GLGetProcAddress typedef to function returning function pointer (Closed)
Patch Set: fix cast Created 4 years 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
« no previous file with comments | « no previous file | ui/gl/generate_bindings.py » ('j') | ui/gl/gl_implementation.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 40ca073a37c17ce033dfb0e665eced0eed2718f1..3600c1982174487819c473945e8932e43d382b19 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_framebuffers.cc
@@ -3397,7 +3397,8 @@ TEST_P(GLES2DecoderManualInitTest, InvalidateFramebufferBinding) {
// EXPECT_EQ can't be used to compare function pointers
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
- gl::g_driver_gl.fn.glDiscardFramebufferEXTFn);
+ reinterpret_cast<gl::GLFunctionPointerType>(
+ gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT"));
@@ -3447,7 +3448,8 @@ TEST_P(GLES2DecoderManualInitTest, DiscardFramebufferEXT) {
// EXPECT_EQ can't be used to compare function pointers
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
- gl::g_driver_gl.fn.glDiscardFramebufferEXTFn);
+ reinterpret_cast<gl::GLFunctionPointerType>(
+ gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
const GLenum target = GL_FRAMEBUFFER;
const GLsizei count = 1;
@@ -3489,7 +3491,8 @@ TEST_P(GLES2DecoderManualInitTest, ClearBackbufferBitsOnDiscardFramebufferEXT) {
// EXPECT_EQ can't be used to compare function pointers.
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
- gl::g_driver_gl.fn.glDiscardFramebufferEXTFn);
+ reinterpret_cast<gl::GLFunctionPointerType>(
+ gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
const GLenum target = GL_FRAMEBUFFER;
const GLsizei count = 1;
@@ -3712,7 +3715,8 @@ TEST_P(GLES2DecoderManualInitTest,
// and the framebuffer as incomplete.
EXPECT_TRUE(
gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
- gl::g_driver_gl.fn.glDiscardFramebufferEXTFn);
+ reinterpret_cast<gl::GLFunctionPointerType>(
+ gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
const GLenum target = GL_FRAMEBUFFER;
const GLsizei count = 1;
« no previous file with comments | « no previous file | ui/gl/generate_bindings.py » ('j') | ui/gl/gl_implementation.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698