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

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

Issue 16293004: Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 | Annotate | Revision Log
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/shader_manager.h" 5 #include "gpu/command_buffer/service/shader_manager.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "gpu/command_buffer/service/mocks.h" 8 #include "gpu/command_buffer/service/mocks.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/gl/gl_mock.h" 10 #include "ui/gl/gl_mock.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 const GLuint kClient1Id = 1; 81 const GLuint kClient1Id = 1;
82 const GLuint kClient2Id = 2; 82 const GLuint kClient2Id = 2;
83 const GLuint kService1Id = 11; 83 const GLuint kService1Id = 11;
84 const GLuint kService2Id = 12; 84 const GLuint kService2Id = 12;
85 const GLenum kShaderType = GL_VERTEX_SHADER; 85 const GLenum kShaderType = GL_VERTEX_SHADER;
86 // Check we can create shader. 86 // Check we can create shader.
87 scoped_refptr<Shader> shader1( 87 scoped_refptr<Shader> shader1(
88 manager_.CreateShader(kClient1Id, kService1Id, kShaderType)); 88 manager_.CreateShader(kClient1Id, kService1Id, kShaderType));
89 scoped_refptr<Shader> shader2( 89 scoped_refptr<Shader> shader2(
90 manager_.CreateShader(kClient2Id, kService2Id, kShaderType)); 90 manager_.CreateShader(kClient2Id, kService2Id, kShaderType));
91 ASSERT_TRUE(shader1); 91 ASSERT_TRUE(shader1.get());
92 ASSERT_TRUE(shader2); 92 ASSERT_TRUE(shader2.get());
93 manager_.UseShader(shader1); 93 manager_.UseShader(shader1.get());
94 manager_.MarkAsDeleted(shader1); 94 manager_.MarkAsDeleted(shader1.get());
95 manager_.MarkAsDeleted(shader2); 95 manager_.MarkAsDeleted(shader2.get());
96 EXPECT_TRUE(manager_.IsOwned(shader1)); 96 EXPECT_TRUE(manager_.IsOwned(shader1.get()));
97 EXPECT_FALSE(manager_.IsOwned(shader2)); 97 EXPECT_FALSE(manager_.IsOwned(shader2.get()));
98 } 98 }
99 99
100 TEST_F(ShaderManagerTest, Shader) { 100 TEST_F(ShaderManagerTest, Shader) {
101 const GLuint kClient1Id = 1; 101 const GLuint kClient1Id = 1;
102 const GLuint kService1Id = 11; 102 const GLuint kService1Id = 11;
103 const GLenum kShader1Type = GL_VERTEX_SHADER; 103 const GLenum kShader1Type = GL_VERTEX_SHADER;
104 const char* kClient1Source = "hello world"; 104 const char* kClient1Source = "hello world";
105 // Check we can create shader. 105 // Check we can create shader.
106 Shader* shader1 = manager_.CreateShader( 106 Shader* shader1 = manager_.CreateShader(
107 kClient1Id, kService1Id, kShader1Type); 107 kClient1Id, kService1Id, kShader1Type);
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 EXPECT_EQ("original source", *shader->deferred_compilation_source()); 283 EXPECT_EQ("original source", *shader->deferred_compilation_source());
284 shader->UpdateSource("different!"); 284 shader->UpdateSource("different!");
285 EXPECT_EQ("original source", *shader->deferred_compilation_source()); 285 EXPECT_EQ("original source", *shader->deferred_compilation_source());
286 286
287 shader->FlagSourceAsCompiled(true); 287 shader->FlagSourceAsCompiled(true);
288 EXPECT_EQ("different!", *shader->deferred_compilation_source()); 288 EXPECT_EQ("different!", *shader->deferred_compilation_source());
289 } 289 }
290 290
291 } // namespace gles2 291 } // namespace gles2
292 } // namespace gpu 292 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/shader_manager.cc ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698