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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

Issue 2043983002: gpu: Disallow null client ids in Gen* functions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_unittest.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 GetImmediateAs<cmds::GenQueriesEXTImmediate>(); 480 GetImmediateAs<cmds::GenQueriesEXTImmediate>();
481 GLuint temp = kNewClientId; 481 GLuint temp = kNewClientId;
482 cmd->Init(1, &temp); 482 cmd->Init(1, &temp);
483 EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(*cmd, sizeof(temp))); 483 EXPECT_EQ(error::kNoError, ExecuteImmediateCmd(*cmd, sizeof(temp)));
484 EXPECT_EQ(GL_NO_ERROR, GetGLError()); 484 EXPECT_EQ(GL_NO_ERROR, GetGLError());
485 QueryManager* query_manager = decoder_->GetQueryManager(); 485 QueryManager* query_manager = decoder_->GetQueryManager();
486 ASSERT_TRUE(query_manager != NULL); 486 ASSERT_TRUE(query_manager != NULL);
487 EXPECT_TRUE(query_manager->IsValidQuery(kNewClientId)); 487 EXPECT_TRUE(query_manager->IsValidQuery(kNewClientId));
488 } 488 }
489 489
490 TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateDuplicateIds) { 490 TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateDuplicateOrNullIds) {
491 cmds::GenQueriesEXTImmediate* cmd = 491 cmds::GenQueriesEXTImmediate* cmd =
492 GetImmediateAs<cmds::GenQueriesEXTImmediate>(); 492 GetImmediateAs<cmds::GenQueriesEXTImmediate>();
493 GLuint temp[3] = {kNewClientId, kNewClientId + 1, kNewClientId}; 493 GLuint temp[3] = {kNewClientId, kNewClientId + 1, kNewClientId};
494 cmd->Init(3, temp); 494 cmd->Init(3, temp);
495 EXPECT_EQ(error::kInvalidArguments, ExecuteImmediateCmd(*cmd, sizeof(temp))); 495 EXPECT_EQ(error::kInvalidArguments, ExecuteImmediateCmd(*cmd, sizeof(temp)));
496 QueryManager* query_manager = decoder_->GetQueryManager(); 496 QueryManager* query_manager = decoder_->GetQueryManager();
497 ASSERT_TRUE(query_manager != NULL); 497 ASSERT_TRUE(query_manager != NULL);
498 EXPECT_FALSE(query_manager->IsValidQuery(kNewClientId)); 498 EXPECT_FALSE(query_manager->IsValidQuery(kNewClientId));
499 EXPECT_FALSE(query_manager->IsValidQuery(kNewClientId + 1)); 499 EXPECT_FALSE(query_manager->IsValidQuery(kNewClientId + 1));
500 GLuint null_id[2] = {kNewClientId, 0};
501 cmd->Init(2, null_id);
502 EXPECT_EQ(error::kInvalidArguments,
503 ExecuteImmediateCmd(*cmd, sizeof(temp)));
504 EXPECT_FALSE(query_manager->IsValidQuery(kNewClientId));
500 } 505 }
501 506
502 TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateInvalidArgs) { 507 TEST_P(GLES2DecoderTest, GenQueriesEXTImmediateInvalidArgs) {
503 cmds::GenQueriesEXTImmediate* cmd = 508 cmds::GenQueriesEXTImmediate* cmd =
504 GetImmediateAs<cmds::GenQueriesEXTImmediate>(); 509 GetImmediateAs<cmds::GenQueriesEXTImmediate>();
505 cmd->Init(1, &client_query_id_); 510 cmd->Init(1, &client_query_id_);
506 EXPECT_EQ(error::kInvalidArguments, 511 EXPECT_EQ(error::kInvalidArguments,
507 ExecuteImmediateCmd(*cmd, sizeof(&client_query_id_))); 512 ExecuteImmediateCmd(*cmd, sizeof(&client_query_id_)));
508 } 513 }
509 514
(...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after
1790 ::testing::Bool()); 1795 ::testing::Bool());
1791 1796
1792 INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderTest, ::testing::Bool()); 1797 INSTANTIATE_TEST_CASE_P(Service, GLES3DecoderTest, ::testing::Bool());
1793 1798
1794 INSTANTIATE_TEST_CASE_P(Service, 1799 INSTANTIATE_TEST_CASE_P(Service,
1795 GLES3DecoderWithESSL3ShaderTest, 1800 GLES3DecoderWithESSL3ShaderTest,
1796 ::testing::Bool()); 1801 ::testing::Bool());
1797 1802
1798 } // namespace gles2 1803 } // namespace gles2
1799 } // namespace gpu 1804 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698