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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/gl/generate_bindings.py » ('j') | ui/gl/gl_implementation.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 3379 matching lines...) Expand 10 before | Expand all | Expand 10 after
3390 } 3390 }
3391 3391
3392 TEST_P(GLES2DecoderManualInitTest, InvalidateFramebufferBinding) { 3392 TEST_P(GLES2DecoderManualInitTest, InvalidateFramebufferBinding) {
3393 InitState init; 3393 InitState init;
3394 init.gl_version = "opengl es 3.0"; 3394 init.gl_version = "opengl es 3.0";
3395 InitDecoder(init); 3395 InitDecoder(init);
3396 3396
3397 // EXPECT_EQ can't be used to compare function pointers 3397 // EXPECT_EQ can't be used to compare function pointers
3398 EXPECT_TRUE( 3398 EXPECT_TRUE(
3399 gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") != 3399 gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
3400 gl::g_driver_gl.fn.glDiscardFramebufferEXTFn); 3400 reinterpret_cast<gl::GLFunctionPointerType>(
3401 gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
3401 EXPECT_TRUE( 3402 EXPECT_TRUE(
3402 gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") != 3403 gl::MockGLInterface::GetGLProcAddress("glInvalidateFramebuffer") !=
3403 gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT")); 3404 gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT"));
3404 } 3405 }
3405 3406
3406 TEST_P(GLES2DecoderTest, ClearBackbufferBitsOnFlipSwap) { 3407 TEST_P(GLES2DecoderTest, ClearBackbufferBitsOnFlipSwap) {
3407 surface_->set_buffers_flipped(true); 3408 surface_->set_buffers_flipped(true);
3408 3409
3409 EXPECT_EQ(0u, GetAndClearBackbufferClearBitsForTest()); 3410 EXPECT_EQ(0u, GetAndClearBackbufferClearBitsForTest());
3410 3411
(...skipping 29 matching lines...) Expand all
3440 3441
3441 TEST_P(GLES2DecoderManualInitTest, DiscardFramebufferEXT) { 3442 TEST_P(GLES2DecoderManualInitTest, DiscardFramebufferEXT) {
3442 InitState init; 3443 InitState init;
3443 init.extensions = "GL_EXT_discard_framebuffer"; 3444 init.extensions = "GL_EXT_discard_framebuffer";
3444 init.gl_version = "opengl es 2.0"; 3445 init.gl_version = "opengl es 2.0";
3445 InitDecoder(init); 3446 InitDecoder(init);
3446 3447
3447 // EXPECT_EQ can't be used to compare function pointers 3448 // EXPECT_EQ can't be used to compare function pointers
3448 EXPECT_TRUE( 3449 EXPECT_TRUE(
3449 gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") == 3450 gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
3450 gl::g_driver_gl.fn.glDiscardFramebufferEXTFn); 3451 reinterpret_cast<gl::GLFunctionPointerType>(
3452 gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
3451 3453
3452 const GLenum target = GL_FRAMEBUFFER; 3454 const GLenum target = GL_FRAMEBUFFER;
3453 const GLsizei count = 1; 3455 const GLsizei count = 1;
3454 const GLenum attachments[] = {GL_COLOR_ATTACHMENT0}; 3456 const GLenum attachments[] = {GL_COLOR_ATTACHMENT0};
3455 3457
3456 SetupTexture(); 3458 SetupTexture();
3457 DoBindFramebuffer( 3459 DoBindFramebuffer(
3458 GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId); 3460 GL_FRAMEBUFFER, client_framebuffer_id_, kServiceFramebufferId);
3459 DoFramebufferTexture2D(GL_FRAMEBUFFER, 3461 DoFramebufferTexture2D(GL_FRAMEBUFFER,
3460 GL_COLOR_ATTACHMENT0, 3462 GL_COLOR_ATTACHMENT0,
(...skipping 21 matching lines...) Expand all
3482 3484
3483 TEST_P(GLES2DecoderManualInitTest, ClearBackbufferBitsOnDiscardFramebufferEXT) { 3485 TEST_P(GLES2DecoderManualInitTest, ClearBackbufferBitsOnDiscardFramebufferEXT) {
3484 InitState init; 3486 InitState init;
3485 init.extensions = "GL_EXT_discard_framebuffer"; 3487 init.extensions = "GL_EXT_discard_framebuffer";
3486 init.gl_version = "opengl es 2.0"; 3488 init.gl_version = "opengl es 2.0";
3487 InitDecoder(init); 3489 InitDecoder(init);
3488 3490
3489 // EXPECT_EQ can't be used to compare function pointers. 3491 // EXPECT_EQ can't be used to compare function pointers.
3490 EXPECT_TRUE( 3492 EXPECT_TRUE(
3491 gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") == 3493 gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
3492 gl::g_driver_gl.fn.glDiscardFramebufferEXTFn); 3494 reinterpret_cast<gl::GLFunctionPointerType>(
3495 gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
3493 3496
3494 const GLenum target = GL_FRAMEBUFFER; 3497 const GLenum target = GL_FRAMEBUFFER;
3495 const GLsizei count = 1; 3498 const GLsizei count = 1;
3496 GLenum attachments[] = {GL_COLOR_EXT}; 3499 GLenum attachments[] = {GL_COLOR_EXT};
3497 3500
3498 EXPECT_CALL(*gl_, DiscardFramebufferEXT(target, count, _)) 3501 EXPECT_CALL(*gl_, DiscardFramebufferEXT(target, count, _))
3499 .Times(1) 3502 .Times(1)
3500 .RetiresOnSaturation(); 3503 .RetiresOnSaturation();
3501 DiscardFramebufferEXTImmediate& cmd = 3504 DiscardFramebufferEXTImmediate& cmd =
3502 *GetImmediateAs<DiscardFramebufferEXTImmediate>(); 3505 *GetImmediateAs<DiscardFramebufferEXTImmediate>();
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
3705 FramebufferManager* framebuffer_manager = group().framebuffer_manager(); 3708 FramebufferManager* framebuffer_manager = group().framebuffer_manager();
3706 Framebuffer* framebuffer = 3709 Framebuffer* framebuffer =
3707 framebuffer_manager->GetFramebuffer(client_framebuffer_id_); 3710 framebuffer_manager->GetFramebuffer(client_framebuffer_id_);
3708 EXPECT_TRUE(framebuffer->IsCleared()); 3711 EXPECT_TRUE(framebuffer->IsCleared());
3709 EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer)); 3712 EXPECT_TRUE(framebuffer_manager->IsComplete(framebuffer));
3710 3713
3711 // Check that Discard GL_COLOR_ATTACHMENT0, sets the attachment as uncleared 3714 // Check that Discard GL_COLOR_ATTACHMENT0, sets the attachment as uncleared
3712 // and the framebuffer as incomplete. 3715 // and the framebuffer as incomplete.
3713 EXPECT_TRUE( 3716 EXPECT_TRUE(
3714 gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") == 3717 gl::MockGLInterface::GetGLProcAddress("glDiscardFramebufferEXT") ==
3715 gl::g_driver_gl.fn.glDiscardFramebufferEXTFn); 3718 reinterpret_cast<gl::GLFunctionPointerType>(
3719 gl::g_driver_gl.fn.glDiscardFramebufferEXTFn));
3716 3720
3717 const GLenum target = GL_FRAMEBUFFER; 3721 const GLenum target = GL_FRAMEBUFFER;
3718 const GLsizei count = 1; 3722 const GLsizei count = 1;
3719 const GLenum attachments[] = {GL_COLOR_ATTACHMENT0}; 3723 const GLenum attachments[] = {GL_COLOR_ATTACHMENT0};
3720 3724
3721 DiscardFramebufferEXTImmediate& discard_cmd = 3725 DiscardFramebufferEXTImmediate& discard_cmd =
3722 *GetImmediateAs<DiscardFramebufferEXTImmediate>(); 3726 *GetImmediateAs<DiscardFramebufferEXTImmediate>();
3723 discard_cmd.Init(target, count, attachments); 3727 discard_cmd.Init(target, count, attachments);
3724 3728
3725 EXPECT_CALL(*gl_, DiscardFramebufferEXT(target, count, _)) 3729 EXPECT_CALL(*gl_, DiscardFramebufferEXT(target, count, _))
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
4033 EXPECT_EQ(GL_NO_ERROR, GetGLError()); 4037 EXPECT_EQ(GL_NO_ERROR, GetGLError());
4034 } 4038 }
4035 } 4039 }
4036 4040
4037 // TODO(gman): PixelStorei 4041 // TODO(gman): PixelStorei
4038 4042
4039 // TODO(gman): SwapBuffers 4043 // TODO(gman): SwapBuffers
4040 4044
4041 } // namespace gles2 4045 } // namespace gles2
4042 } // namespace gpu 4046 } // namespace gpu
OLDNEW
« 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