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

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

Issue 8680002: Added minimal support to command buffer for GL_ARB_texture_rectangle (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_base.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0 + tt)) 114 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0 + tt))
115 .Times(1) 115 .Times(1)
116 .RetiresOnSaturation(); 116 .RetiresOnSaturation();
117 if (group_->feature_info()->feature_flags().oes_egl_image_external) { 117 if (group_->feature_info()->feature_flags().oes_egl_image_external) {
118 EXPECT_CALL(*gl_, BindTexture( 118 EXPECT_CALL(*gl_, BindTexture(
119 GL_TEXTURE_EXTERNAL_OES, 119 GL_TEXTURE_EXTERNAL_OES,
120 TestHelper::kServiceDefaultExternalTextureId)) 120 TestHelper::kServiceDefaultExternalTextureId))
121 .Times(1) 121 .Times(1)
122 .RetiresOnSaturation(); 122 .RetiresOnSaturation();
123 } 123 }
124 if (group_->feature_info()->feature_flags().arb_texture_rectangle) {
125 EXPECT_CALL(*gl_, BindTexture(
126 GL_TEXTURE_RECTANGLE_ARB,
127 TestHelper::kServiceDefaultRectangleTextureId))
128 .Times(1)
129 .RetiresOnSaturation();
130 }
124 EXPECT_CALL(*gl_, BindTexture( 131 EXPECT_CALL(*gl_, BindTexture(
125 GL_TEXTURE_CUBE_MAP, TestHelper::kServiceDefaultTextureCubemapId)) 132 GL_TEXTURE_CUBE_MAP, TestHelper::kServiceDefaultTextureCubemapId))
126 .Times(1) 133 .Times(1)
127 .RetiresOnSaturation(); 134 .RetiresOnSaturation();
128 EXPECT_CALL(*gl_, BindTexture( 135 EXPECT_CALL(*gl_, BindTexture(
129 GL_TEXTURE_2D, TestHelper::kServiceDefaultTexture2dId)) 136 GL_TEXTURE_2D, TestHelper::kServiceDefaultTexture2dId))
130 .Times(1) 137 .Times(1)
131 .RetiresOnSaturation(); 138 .RetiresOnSaturation();
132 } 139 }
133 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0)) 140 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0))
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 num_vertices, buffer_id, GL_NO_ERROR); 1070 num_vertices, buffer_id, GL_NO_ERROR);
1064 } 1071 }
1065 1072
1066 void GLES2DecoderWithShaderTestBase::SetUp() { 1073 void GLES2DecoderWithShaderTestBase::SetUp() {
1067 GLES2DecoderTestBase::SetUp(); 1074 GLES2DecoderTestBase::SetUp();
1068 SetupDefaultProgram(); 1075 SetupDefaultProgram();
1069 } 1076 }
1070 1077
1071 } // namespace gles2 1078 } // namespace gles2
1072 } // namespace gpu 1079 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698