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

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

Issue 706903004: Revert of Add subscribeUniform extension pipeline (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_valuebuffer.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_valuebuffer.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_valuebuffer.cc
deleted file mode 100644
index 012d5041755faeb1f47ee596dda2005996bd9835..0000000000000000000000000000000000000000
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_valuebuffer.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2014 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.
-
-#include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-
-#include "base/command_line.h"
-#include "gpu/command_buffer/common/gles2_cmd_format.h"
-#include "gpu/command_buffer/common/gles2_cmd_utils.h"
-#include "gpu/command_buffer/service/gles2_cmd_decoder_unittest.h"
-
-#include "gpu/command_buffer/service/test_helper.h"
-#include "gpu/command_buffer/service/valuebuffer_manager.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_mock.h"
-#include "ui/gl/gl_surface_stub.h"
-
-using ::gfx::MockGLInterface;
-using ::testing::_;
-
-namespace gpu {
-namespace gles2 {
-
-using namespace cmds;
-
-TEST_P(GLES2DecoderWithShaderTest, ValuebufferBasic) {
- const uint32 kBufferId = 123;
- ValueState valuestate;
- valuestate.int_value[0] = 111;
- valuestate.int_value[1] = 222;
- valuebuffer_manager()->CreateValuebuffer(kBufferId);
- valuebuffer_manager()->UpdateValueState(
- GL_MOUSE_POSITION_CHROMIUM, valuestate);
- BindValuebufferCHROMIUM cmd1;
- cmd1.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, kBufferId);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));
- SubscribeValueCHROMIUM cmd2;
- cmd2.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, GL_MOUSE_POSITION_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
- PopulateSubscribedValuesCHROMIUM cmd3;
- cmd3.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd3));
- EXPECT_CALL(*gl_, Uniform2iv(kUniform2RealLocation, 1, _)).Times(1);
- UniformValuebufferCHROMIUM cmd4;
- cmd4.Init(kUniform2FakeLocation, GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM,
- GL_MOUSE_POSITION_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd4));
-}
-
-TEST_P(GLES2DecoderWithShaderTest, SubscribeValuebufferNotBound) {
- const uint32 kBufferId = 123;
- ValueState valuestate;
- valuestate.int_value[0] = 111;
- valuestate.int_value[1] = 222;
- valuebuffer_manager()->CreateValuebuffer(kBufferId);
- valuebuffer_manager()->UpdateValueState(
- GL_MOUSE_POSITION_CHROMIUM, valuestate);
- SubscribeValueCHROMIUM cmd1;
- cmd1.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, GL_MOUSE_POSITION_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));
- EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
-}
-
-TEST_P(GLES2DecoderWithShaderTest, PopulateValuebufferNoSubscription) {
- const uint32 kBufferId = 123;
- ValueState valuestate;
- valuestate.int_value[0] = 111;
- valuestate.int_value[1] = 222;
- valuebuffer_manager()->CreateValuebuffer(kBufferId);
- valuebuffer_manager()->UpdateValueState(
- GL_MOUSE_POSITION_CHROMIUM, valuestate);
- BindValuebufferCHROMIUM cmd1;
- cmd1.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, kBufferId);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));
- PopulateSubscribedValuesCHROMIUM cmd2;
- cmd2.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
- EXPECT_EQ(GL_NONE, GetGLError());
-}
-
-TEST_P(GLES2DecoderWithShaderTest, UniformValuebufferNoState) {
- const uint32 kBufferId = 123;
- ValueState valuestate;
- valuestate.int_value[0] = 111;
- valuestate.int_value[1] = 222;
- valuebuffer_manager()->CreateValuebuffer(kBufferId);
- valuebuffer_manager()->UpdateValueState(
- GL_MOUSE_POSITION_CHROMIUM, valuestate);
- BindValuebufferCHROMIUM cmd1;
- cmd1.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, kBufferId);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));
- SubscribeValueCHROMIUM cmd2;
- cmd2.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, GL_MOUSE_POSITION_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
- EXPECT_CALL(*gl_, Uniform2iv(kUniform2RealLocation, 1, _)).Times(0);
- UniformValuebufferCHROMIUM cmd3;
- cmd3.Init(kUniform2FakeLocation, GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM,
- GL_MOUSE_POSITION_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd3));
- EXPECT_EQ(GL_NONE, GetGLError());
-}
-
-TEST_P(GLES2DecoderWithShaderTest, UniformValuebufferInvalidLocation) {
- const uint32 kBufferId = 123;
- ValueState valuestate;
- valuestate.int_value[0] = 111;
- valuestate.int_value[1] = 222;
- valuebuffer_manager()->CreateValuebuffer(kBufferId);
- valuebuffer_manager()->UpdateValueState(
- GL_MOUSE_POSITION_CHROMIUM, valuestate);
- BindValuebufferCHROMIUM cmd1;
- cmd1.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, kBufferId);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd1));
- SubscribeValueCHROMIUM cmd2;
- cmd2.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM, GL_MOUSE_POSITION_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd2));
- PopulateSubscribedValuesCHROMIUM cmd3;
- cmd3.Init(GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd3));
- EXPECT_CALL(*gl_, Uniform2iv(kUniform2RealLocation, 1, _)).Times(0);
- UniformValuebufferCHROMIUM cmd4;
- cmd4.Init(kUniform1FakeLocation, GL_SUBSCRIBED_VALUES_BUFFER_CHROMIUM,
- GL_MOUSE_POSITION_CHROMIUM);
- EXPECT_EQ(error::kNoError, ExecuteCmd(cmd4));
- EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
-}
-
-} // namespace gles2
-} // namespace gpu

Powered by Google App Engine
This is Rietveld 408576698