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

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

Issue 7458008: Support GL_OES_EGL_image_external (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix typo which hung the windows gpu_unittests by corrupting the stack Created 9 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 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 EXPECT_CALL(*gl_, GenBuffersARB(arraysize(fixed_attrib_buffer_id), _)) 103 EXPECT_CALL(*gl_, GenBuffersARB(arraysize(fixed_attrib_buffer_id), _))
104 .WillOnce(SetArrayArgument<1>( 104 .WillOnce(SetArrayArgument<1>(
105 fixed_attrib_buffer_id, 105 fixed_attrib_buffer_id,
106 fixed_attrib_buffer_id + arraysize(fixed_attrib_buffer_id))) 106 fixed_attrib_buffer_id + arraysize(fixed_attrib_buffer_id)))
107 .RetiresOnSaturation(); 107 .RetiresOnSaturation();
108 108
109 for (GLint tt = 0; tt < TestHelper::kNumTextureUnits; ++tt) { 109 for (GLint tt = 0; tt < TestHelper::kNumTextureUnits; ++tt) {
110 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0 + tt)) 110 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0 + tt))
111 .Times(1) 111 .Times(1)
112 .RetiresOnSaturation(); 112 .RetiresOnSaturation();
113 if (group_->feature_info()->feature_flags().oes_egl_image_external) {
114 EXPECT_CALL(*gl_, BindTexture(
115 GL_TEXTURE_EXTERNAL_OES,
116 TestHelper::kServiceDefaultExternalTextureId))
117 .Times(1)
118 .RetiresOnSaturation();
119 }
113 EXPECT_CALL(*gl_, BindTexture( 120 EXPECT_CALL(*gl_, BindTexture(
114 GL_TEXTURE_CUBE_MAP, TestHelper::kServiceDefaultTextureCubemapId)) 121 GL_TEXTURE_CUBE_MAP, TestHelper::kServiceDefaultTextureCubemapId))
115 .Times(1) 122 .Times(1)
116 .RetiresOnSaturation(); 123 .RetiresOnSaturation();
117 EXPECT_CALL(*gl_, BindTexture( 124 EXPECT_CALL(*gl_, BindTexture(
118 GL_TEXTURE_2D, TestHelper::kServiceDefaultTexture2dId)) 125 GL_TEXTURE_2D, TestHelper::kServiceDefaultTexture2dId))
119 .Times(1) 126 .Times(1)
120 .RetiresOnSaturation(); 127 .RetiresOnSaturation();
121 } 128 }
122 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0)) 129 EXPECT_CALL(*gl_, ActiveTexture(GL_TEXTURE0))
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 888
882 const char* GLES2DecoderWithShaderTestBase::kAttrib1Name = "attrib1"; 889 const char* GLES2DecoderWithShaderTestBase::kAttrib1Name = "attrib1";
883 const char* GLES2DecoderWithShaderTestBase::kAttrib2Name = "attrib2"; 890 const char* GLES2DecoderWithShaderTestBase::kAttrib2Name = "attrib2";
884 const char* GLES2DecoderWithShaderTestBase::kAttrib3Name = "attrib3"; 891 const char* GLES2DecoderWithShaderTestBase::kAttrib3Name = "attrib3";
885 const char* GLES2DecoderWithShaderTestBase::kUniform1Name = "uniform1"; 892 const char* GLES2DecoderWithShaderTestBase::kUniform1Name = "uniform1";
886 const char* GLES2DecoderWithShaderTestBase::kUniform2Name = "uniform2[0]"; 893 const char* GLES2DecoderWithShaderTestBase::kUniform2Name = "uniform2[0]";
887 const char* GLES2DecoderWithShaderTestBase::kUniform3Name = "uniform3[0]"; 894 const char* GLES2DecoderWithShaderTestBase::kUniform3Name = "uniform3[0]";
888 895
889 } // namespace gles2 896 } // namespace gles2
890 } // namespace gpu 897 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc ('k') | gpu/command_buffer/service/gles2_cmd_validation_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698