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

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

Issue 10795037: Revert 147328 - Current status of patch: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « gpu/command_buffer/service/shader_manager.cc ('k') | gpu/command_buffer/service/shader_translator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/shader_manager_unittest.cc
===================================================================
--- gpu/command_buffer/service/shader_manager_unittest.cc (revision 147496)
+++ gpu/command_buffer/service/shader_manager_unittest.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -245,39 +245,7 @@
EXPECT_TRUE(info2 == NULL);
}
-TEST_F(ShaderManagerTest, ShaderInfoStoreCompilationStatus) {
- const GLuint kClientId = 1;
- const GLuint kServiceId = 11;
- const GLenum kShaderType = GL_VERTEX_SHADER;
- ShaderManager::ShaderInfo* info = manager_.CreateShaderInfo(
- kClientId, kServiceId, kShaderType);
- ASSERT_TRUE(info != NULL);
-
- info->UpdateSource("original source");
- info->FlagSourceAsCompiled(false);
- EXPECT_FALSE(info->source_compiled());
- info->FlagSourceAsCompiled(true);
- EXPECT_TRUE(info->source_compiled());
-}
-
-TEST_F(ShaderManagerTest, ShaderInfoStoreDeferredSource) {
- const GLuint kClientId = 1;
- const GLuint kServiceId = 11;
- const GLenum kShaderType = GL_VERTEX_SHADER;
- ShaderManager::ShaderInfo* info = manager_.CreateShaderInfo(
- kClientId, kServiceId, kShaderType);
- ASSERT_TRUE(info != NULL);
-
- info->UpdateSource("original source");
- info->FlagSourceAsCompiled(false);
-
- EXPECT_EQ("original source", *info->deferred_compilation_source());
- info->UpdateSource("different!");
- EXPECT_EQ("original source", *info->deferred_compilation_source());
-
- info->FlagSourceAsCompiled(true);
- EXPECT_EQ("different!", *info->deferred_compilation_source());
-}
-
} // namespace gles2
} // namespace gpu
+
+
« no previous file with comments | « gpu/command_buffer/service/shader_manager.cc ('k') | gpu/command_buffer/service/shader_translator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698