| OLD | NEW |
| 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/texture_manager.h" | 5 #include "gpu/command_buffer/service/texture_manager.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 TestHelper::SetTexParameteriWithExpectations( | 94 TestHelper::SetTexParameteriWithExpectations( |
| 95 gl_.get(), error_state_.get(), manager_.get(), | 95 gl_.get(), error_state_.get(), manager_.get(), |
| 96 texture_ref, pname, value, error); | 96 texture_ref, pname, value, error); |
| 97 } | 97 } |
| 98 | 98 |
| 99 void SetupFeatureInfo(const char* gl_extensions, | 99 void SetupFeatureInfo(const char* gl_extensions, |
| 100 const char* gl_version, | 100 const char* gl_version, |
| 101 bool enable_es3) { | 101 bool enable_es3) { |
| 102 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion( | 102 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion( |
| 103 gl_.get(), gl_extensions, "", gl_version); | 103 gl_.get(), gl_extensions, "", gl_version); |
| 104 feature_info_->Initialize(); | 104 feature_info_->InitializeForTesting(); |
| 105 if (enable_es3) { | 105 if (enable_es3) { |
| 106 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _)) | 106 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _)) |
| 107 .WillOnce(SetArgPointee<1>(8)) | 107 .WillOnce(SetArgPointee<1>(8)) |
| 108 .RetiresOnSaturation(); | 108 .RetiresOnSaturation(); |
| 109 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_DRAW_BUFFERS, _)) | 109 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_DRAW_BUFFERS, _)) |
| 110 .WillOnce(SetArgPointee<1>(8)) | 110 .WillOnce(SetArgPointee<1>(8)) |
| 111 .RetiresOnSaturation(); | 111 .RetiresOnSaturation(); |
| 112 feature_info_->EnableES3Validators(); | 112 feature_info_->EnableES3Validators(); |
| 113 } | 113 } |
| 114 } | 114 } |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 (kMaxCubeMapTextureSize >> level) * 2, | 437 (kMaxCubeMapTextureSize >> level) * 2, |
| 438 (kMaxCubeMapTextureSize >> level) * 2, | 438 (kMaxCubeMapTextureSize >> level) * 2, |
| 439 1)); | 439 1)); |
| 440 } | 440 } |
| 441 } | 441 } |
| 442 | 442 |
| 443 TEST_F(TextureManagerTest, ValidForTargetNPOT) { | 443 TEST_F(TextureManagerTest, ValidForTargetNPOT) { |
| 444 TestHelper::SetupFeatureInfoInitExpectations( | 444 TestHelper::SetupFeatureInfoInitExpectations( |
| 445 gl_.get(), "GL_OES_texture_npot"); | 445 gl_.get(), "GL_OES_texture_npot"); |
| 446 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); | 446 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); |
| 447 feature_info->Initialize(); | 447 feature_info->InitializeForTesting(); |
| 448 TextureManager manager(NULL, | 448 TextureManager manager(NULL, |
| 449 feature_info.get(), | 449 feature_info.get(), |
| 450 kMaxTextureSize, | 450 kMaxTextureSize, |
| 451 kMaxCubeMapTextureSize, | 451 kMaxCubeMapTextureSize, |
| 452 kMaxRectangleTextureSize, | 452 kMaxRectangleTextureSize, |
| 453 kMax3DTextureSize, | 453 kMax3DTextureSize, |
| 454 kUseDefaultTextures); | 454 kUseDefaultTextures); |
| 455 // Check NPOT width on level 0 | 455 // Check NPOT width on level 0 |
| 456 EXPECT_TRUE(manager.ValidForTarget(GL_TEXTURE_2D, 0, 5, 2, 1)); | 456 EXPECT_TRUE(manager.ValidForTarget(GL_TEXTURE_2D, 0, 5, 2, 1)); |
| 457 // Check NPOT height on level 0 | 457 // Check NPOT height on level 0 |
| (...skipping 21 matching lines...) Expand all Loading... |
| 479 : feature_info_(new FeatureInfo()) { | 479 : feature_info_(new FeatureInfo()) { |
| 480 } | 480 } |
| 481 ~TextureTestBase() override { texture_ref_ = NULL; } | 481 ~TextureTestBase() override { texture_ref_ = NULL; } |
| 482 | 482 |
| 483 protected: | 483 protected: |
| 484 void SetUpBase(MemoryTracker* memory_tracker, const std::string& extensions) { | 484 void SetUpBase(MemoryTracker* memory_tracker, const std::string& extensions) { |
| 485 GpuServiceTest::SetUp(); | 485 GpuServiceTest::SetUp(); |
| 486 if (!extensions.empty()) { | 486 if (!extensions.empty()) { |
| 487 TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), | 487 TestHelper::SetupFeatureInfoInitExpectations(gl_.get(), |
| 488 extensions.c_str()); | 488 extensions.c_str()); |
| 489 feature_info_->Initialize(); | 489 feature_info_->InitializeForTesting(); |
| 490 } | 490 } |
| 491 | 491 |
| 492 manager_.reset(new TextureManager(memory_tracker, | 492 manager_.reset(new TextureManager(memory_tracker, |
| 493 feature_info_.get(), | 493 feature_info_.get(), |
| 494 kMaxTextureSize, | 494 kMaxTextureSize, |
| 495 kMaxCubeMapTextureSize, | 495 kMaxCubeMapTextureSize, |
| 496 kMaxRectangleTextureSize, | 496 kMaxRectangleTextureSize, |
| 497 kMax3DTextureSize, | 497 kMax3DTextureSize, |
| 498 kUseDefaultTextures)); | 498 kUseDefaultTextures)); |
| 499 decoder_.reset(new ::testing::StrictMock<gles2::MockGLES2Decoder>()); | 499 decoder_.reset(new ::testing::StrictMock<gles2::MockGLES2Decoder>()); |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 772 EXPECT_FALSE(TextureTestHelper::IsNPOT(texture)); | 772 EXPECT_FALSE(TextureTestHelper::IsNPOT(texture)); |
| 773 EXPECT_FALSE(TextureTestHelper::IsTextureComplete(texture)); | 773 EXPECT_FALSE(TextureTestHelper::IsTextureComplete(texture)); |
| 774 EXPECT_TRUE(manager_->CanGenerateMipmaps(texture_ref_.get())); | 774 EXPECT_TRUE(manager_->CanGenerateMipmaps(texture_ref_.get())); |
| 775 EXPECT_FALSE(manager_->HaveUnrenderableTextures()); | 775 EXPECT_FALSE(manager_->HaveUnrenderableTextures()); |
| 776 } | 776 } |
| 777 | 777 |
| 778 TEST_F(TextureTest, NPOT2DNPOTOK) { | 778 TEST_F(TextureTest, NPOT2DNPOTOK) { |
| 779 TestHelper::SetupFeatureInfoInitExpectations( | 779 TestHelper::SetupFeatureInfoInitExpectations( |
| 780 gl_.get(), "GL_OES_texture_npot"); | 780 gl_.get(), "GL_OES_texture_npot"); |
| 781 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); | 781 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); |
| 782 feature_info->Initialize(); | 782 feature_info->InitializeForTesting(); |
| 783 TextureManager manager(NULL, | 783 TextureManager manager(NULL, |
| 784 feature_info.get(), | 784 feature_info.get(), |
| 785 kMaxTextureSize, | 785 kMaxTextureSize, |
| 786 kMaxCubeMapTextureSize, | 786 kMaxCubeMapTextureSize, |
| 787 kMaxRectangleTextureSize, | 787 kMaxRectangleTextureSize, |
| 788 kMax3DTextureSize, | 788 kMax3DTextureSize, |
| 789 kUseDefaultTextures); | 789 kUseDefaultTextures); |
| 790 manager.CreateTexture(kClient1Id, kService1Id); | 790 manager.CreateTexture(kClient1Id, kService1Id); |
| 791 TextureRef* texture_ref = manager.GetTexture(kClient1Id); | 791 TextureRef* texture_ref = manager.GetTexture(kClient1Id); |
| 792 ASSERT_TRUE(texture_ref != NULL); | 792 ASSERT_TRUE(texture_ref != NULL); |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1042 // Check valid particial size. | 1042 // Check valid particial size. |
| 1043 EXPECT_TRUE(texture->ValidForTexture(GL_TEXTURE_2D, 1, 1, 1, 1, 2, 3, 4)); | 1043 EXPECT_TRUE(texture->ValidForTexture(GL_TEXTURE_2D, 1, 1, 1, 1, 2, 3, 4)); |
| 1044 manager_->RemoveTexture(kClient1Id); | 1044 manager_->RemoveTexture(kClient1Id); |
| 1045 EXPECT_TRUE(texture->ValidForTexture(GL_TEXTURE_2D, 1, 0, 0, 0, 4, 5, 6)); | 1045 EXPECT_TRUE(texture->ValidForTexture(GL_TEXTURE_2D, 1, 0, 0, 0, 4, 5, 6)); |
| 1046 } | 1046 } |
| 1047 | 1047 |
| 1048 TEST_F(TextureTest, FloatNotLinear) { | 1048 TEST_F(TextureTest, FloatNotLinear) { |
| 1049 TestHelper::SetupFeatureInfoInitExpectations( | 1049 TestHelper::SetupFeatureInfoInitExpectations( |
| 1050 gl_.get(), "GL_OES_texture_float"); | 1050 gl_.get(), "GL_OES_texture_float"); |
| 1051 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); | 1051 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); |
| 1052 feature_info->Initialize(); | 1052 feature_info->InitializeForTesting(); |
| 1053 TextureManager manager(NULL, | 1053 TextureManager manager(NULL, |
| 1054 feature_info.get(), | 1054 feature_info.get(), |
| 1055 kMaxTextureSize, | 1055 kMaxTextureSize, |
| 1056 kMaxCubeMapTextureSize, | 1056 kMaxCubeMapTextureSize, |
| 1057 kMaxRectangleTextureSize, | 1057 kMaxRectangleTextureSize, |
| 1058 kMax3DTextureSize, | 1058 kMax3DTextureSize, |
| 1059 kUseDefaultTextures); | 1059 kUseDefaultTextures); |
| 1060 manager.CreateTexture(kClient1Id, kService1Id); | 1060 manager.CreateTexture(kClient1Id, kService1Id); |
| 1061 TextureRef* texture_ref = manager.GetTexture(kClient1Id); | 1061 TextureRef* texture_ref = manager.GetTexture(kClient1Id); |
| 1062 ASSERT_TRUE(texture_ref != NULL); | 1062 ASSERT_TRUE(texture_ref != NULL); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1074 gl_.get(), error_state_.get(), &manager, texture_ref, | 1074 gl_.get(), error_state_.get(), &manager, texture_ref, |
| 1075 GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST, GL_NO_ERROR); | 1075 GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST, GL_NO_ERROR); |
| 1076 EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture)); | 1076 EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture)); |
| 1077 manager.Destroy(false); | 1077 manager.Destroy(false); |
| 1078 } | 1078 } |
| 1079 | 1079 |
| 1080 TEST_F(TextureTest, FloatLinear) { | 1080 TEST_F(TextureTest, FloatLinear) { |
| 1081 TestHelper::SetupFeatureInfoInitExpectations( | 1081 TestHelper::SetupFeatureInfoInitExpectations( |
| 1082 gl_.get(), "GL_OES_texture_float GL_OES_texture_float_linear"); | 1082 gl_.get(), "GL_OES_texture_float GL_OES_texture_float_linear"); |
| 1083 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); | 1083 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); |
| 1084 feature_info->Initialize(); | 1084 feature_info->InitializeForTesting(); |
| 1085 TextureManager manager(NULL, | 1085 TextureManager manager(NULL, |
| 1086 feature_info.get(), | 1086 feature_info.get(), |
| 1087 kMaxTextureSize, | 1087 kMaxTextureSize, |
| 1088 kMaxCubeMapTextureSize, | 1088 kMaxCubeMapTextureSize, |
| 1089 kMaxRectangleTextureSize, | 1089 kMaxRectangleTextureSize, |
| 1090 kMax3DTextureSize, | 1090 kMax3DTextureSize, |
| 1091 kUseDefaultTextures); | 1091 kUseDefaultTextures); |
| 1092 manager.CreateTexture(kClient1Id, kService1Id); | 1092 manager.CreateTexture(kClient1Id, kService1Id); |
| 1093 TextureRef* texture_ref = manager.GetTexture(kClient1Id); | 1093 TextureRef* texture_ref = manager.GetTexture(kClient1Id); |
| 1094 ASSERT_TRUE(texture_ref != NULL); | 1094 ASSERT_TRUE(texture_ref != NULL); |
| 1095 manager.SetTarget(texture_ref, GL_TEXTURE_2D); | 1095 manager.SetTarget(texture_ref, GL_TEXTURE_2D); |
| 1096 Texture* texture = texture_ref->texture(); | 1096 Texture* texture = texture_ref->texture(); |
| 1097 EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_2D), texture->target()); | 1097 EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_2D), texture->target()); |
| 1098 manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0, | 1098 manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0, |
| 1099 GL_RGBA, GL_FLOAT, gfx::Rect(1, 1)); | 1099 GL_RGBA, GL_FLOAT, gfx::Rect(1, 1)); |
| 1100 EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture)); | 1100 EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture)); |
| 1101 manager.Destroy(false); | 1101 manager.Destroy(false); |
| 1102 } | 1102 } |
| 1103 | 1103 |
| 1104 TEST_F(TextureTest, HalfFloatNotLinear) { | 1104 TEST_F(TextureTest, HalfFloatNotLinear) { |
| 1105 TestHelper::SetupFeatureInfoInitExpectations( | 1105 TestHelper::SetupFeatureInfoInitExpectations( |
| 1106 gl_.get(), "GL_OES_texture_half_float"); | 1106 gl_.get(), "GL_OES_texture_half_float"); |
| 1107 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); | 1107 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); |
| 1108 feature_info->Initialize(); | 1108 feature_info->InitializeForTesting(); |
| 1109 TextureManager manager(NULL, | 1109 TextureManager manager(NULL, |
| 1110 feature_info.get(), | 1110 feature_info.get(), |
| 1111 kMaxTextureSize, | 1111 kMaxTextureSize, |
| 1112 kMaxCubeMapTextureSize, | 1112 kMaxCubeMapTextureSize, |
| 1113 kMaxRectangleTextureSize, | 1113 kMaxRectangleTextureSize, |
| 1114 kMax3DTextureSize, | 1114 kMax3DTextureSize, |
| 1115 kUseDefaultTextures); | 1115 kUseDefaultTextures); |
| 1116 manager.CreateTexture(kClient1Id, kService1Id); | 1116 manager.CreateTexture(kClient1Id, kService1Id); |
| 1117 TextureRef* texture_ref = manager.GetTexture(kClient1Id); | 1117 TextureRef* texture_ref = manager.GetTexture(kClient1Id); |
| 1118 ASSERT_TRUE(texture_ref != NULL); | 1118 ASSERT_TRUE(texture_ref != NULL); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 1130 gl_.get(), error_state_.get(), &manager, texture_ref, | 1130 gl_.get(), error_state_.get(), &manager, texture_ref, |
| 1131 GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST, GL_NO_ERROR); | 1131 GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST, GL_NO_ERROR); |
| 1132 EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture)); | 1132 EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture)); |
| 1133 manager.Destroy(false); | 1133 manager.Destroy(false); |
| 1134 } | 1134 } |
| 1135 | 1135 |
| 1136 TEST_F(TextureTest, HalfFloatLinear) { | 1136 TEST_F(TextureTest, HalfFloatLinear) { |
| 1137 TestHelper::SetupFeatureInfoInitExpectations( | 1137 TestHelper::SetupFeatureInfoInitExpectations( |
| 1138 gl_.get(), "GL_OES_texture_half_float GL_OES_texture_half_float_linear"); | 1138 gl_.get(), "GL_OES_texture_half_float GL_OES_texture_half_float_linear"); |
| 1139 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); | 1139 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); |
| 1140 feature_info->Initialize(); | 1140 feature_info->InitializeForTesting(); |
| 1141 TextureManager manager(NULL, | 1141 TextureManager manager(NULL, |
| 1142 feature_info.get(), | 1142 feature_info.get(), |
| 1143 kMaxTextureSize, | 1143 kMaxTextureSize, |
| 1144 kMaxCubeMapTextureSize, | 1144 kMaxCubeMapTextureSize, |
| 1145 kMaxRectangleTextureSize, | 1145 kMaxRectangleTextureSize, |
| 1146 kMax3DTextureSize, | 1146 kMax3DTextureSize, |
| 1147 kUseDefaultTextures); | 1147 kUseDefaultTextures); |
| 1148 manager.CreateTexture(kClient1Id, kService1Id); | 1148 manager.CreateTexture(kClient1Id, kService1Id); |
| 1149 TextureRef* texture_ref = manager.GetTexture(kClient1Id); | 1149 TextureRef* texture_ref = manager.GetTexture(kClient1Id); |
| 1150 ASSERT_TRUE(texture_ref != NULL); | 1150 ASSERT_TRUE(texture_ref != NULL); |
| 1151 manager.SetTarget(texture_ref, GL_TEXTURE_2D); | 1151 manager.SetTarget(texture_ref, GL_TEXTURE_2D); |
| 1152 Texture* texture = texture_ref->texture(); | 1152 Texture* texture = texture_ref->texture(); |
| 1153 EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_2D), texture->target()); | 1153 EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_2D), texture->target()); |
| 1154 manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0, | 1154 manager.SetLevelInfo(texture_ref, GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 1, 0, |
| 1155 GL_RGBA, GL_HALF_FLOAT_OES, gfx::Rect(1, 1)); | 1155 GL_RGBA, GL_HALF_FLOAT_OES, gfx::Rect(1, 1)); |
| 1156 EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture)); | 1156 EXPECT_TRUE(TextureTestHelper::IsTextureComplete(texture)); |
| 1157 manager.Destroy(false); | 1157 manager.Destroy(false); |
| 1158 } | 1158 } |
| 1159 | 1159 |
| 1160 TEST_F(TextureTest, EGLImageExternal) { | 1160 TEST_F(TextureTest, EGLImageExternal) { |
| 1161 TestHelper::SetupFeatureInfoInitExpectations( | 1161 TestHelper::SetupFeatureInfoInitExpectations( |
| 1162 gl_.get(), "GL_OES_EGL_image_external"); | 1162 gl_.get(), "GL_OES_EGL_image_external"); |
| 1163 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); | 1163 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); |
| 1164 feature_info->Initialize(); | 1164 feature_info->InitializeForTesting(); |
| 1165 TextureManager manager(NULL, | 1165 TextureManager manager(NULL, |
| 1166 feature_info.get(), | 1166 feature_info.get(), |
| 1167 kMaxTextureSize, | 1167 kMaxTextureSize, |
| 1168 kMaxCubeMapTextureSize, | 1168 kMaxCubeMapTextureSize, |
| 1169 kMaxRectangleTextureSize, | 1169 kMaxRectangleTextureSize, |
| 1170 kMax3DTextureSize, | 1170 kMax3DTextureSize, |
| 1171 kUseDefaultTextures); | 1171 kUseDefaultTextures); |
| 1172 manager.CreateTexture(kClient1Id, kService1Id); | 1172 manager.CreateTexture(kClient1Id, kService1Id); |
| 1173 TextureRef* texture_ref = manager.GetTexture(kClient1Id); | 1173 TextureRef* texture_ref = manager.GetTexture(kClient1Id); |
| 1174 ASSERT_TRUE(texture_ref != NULL); | 1174 ASSERT_TRUE(texture_ref != NULL); |
| 1175 manager.SetTarget(texture_ref, GL_TEXTURE_EXTERNAL_OES); | 1175 manager.SetTarget(texture_ref, GL_TEXTURE_EXTERNAL_OES); |
| 1176 Texture* texture = texture_ref->texture(); | 1176 Texture* texture = texture_ref->texture(); |
| 1177 EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_EXTERNAL_OES), texture->target()); | 1177 EXPECT_EQ(static_cast<GLenum>(GL_TEXTURE_EXTERNAL_OES), texture->target()); |
| 1178 EXPECT_FALSE(manager.CanGenerateMipmaps(texture_ref)); | 1178 EXPECT_FALSE(manager.CanGenerateMipmaps(texture_ref)); |
| 1179 manager.Destroy(false); | 1179 manager.Destroy(false); |
| 1180 } | 1180 } |
| 1181 | 1181 |
| 1182 TEST_F(TextureTest, DepthTexture) { | 1182 TEST_F(TextureTest, DepthTexture) { |
| 1183 TestHelper::SetupFeatureInfoInitExpectations( | 1183 TestHelper::SetupFeatureInfoInitExpectations( |
| 1184 gl_.get(), "GL_ANGLE_depth_texture"); | 1184 gl_.get(), "GL_ANGLE_depth_texture"); |
| 1185 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); | 1185 scoped_refptr<FeatureInfo> feature_info(new FeatureInfo()); |
| 1186 feature_info->Initialize(); | 1186 feature_info->InitializeForTesting(); |
| 1187 TextureManager manager(NULL, | 1187 TextureManager manager(NULL, |
| 1188 feature_info.get(), | 1188 feature_info.get(), |
| 1189 kMaxTextureSize, | 1189 kMaxTextureSize, |
| 1190 kMaxCubeMapTextureSize, | 1190 kMaxCubeMapTextureSize, |
| 1191 kMaxRectangleTextureSize, | 1191 kMaxRectangleTextureSize, |
| 1192 kMax3DTextureSize, | 1192 kMax3DTextureSize, |
| 1193 kUseDefaultTextures); | 1193 kUseDefaultTextures); |
| 1194 manager.CreateTexture(kClient1Id, kService1Id); | 1194 manager.CreateTexture(kClient1Id, kService1Id); |
| 1195 TextureRef* texture_ref = manager.GetTexture(kClient1Id); | 1195 TextureRef* texture_ref = manager.GetTexture(kClient1Id); |
| 1196 ASSERT_TRUE(texture_ref != NULL); | 1196 ASSERT_TRUE(texture_ref != NULL); |
| (...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2345 ExpectValid(GL_DEPTH_COMPONENT, GL_FLOAT, GL_DEPTH_COMPONENT32F); | 2345 ExpectValid(GL_DEPTH_COMPONENT, GL_FLOAT, GL_DEPTH_COMPONENT32F); |
| 2346 ExpectValid(GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH24_STENCIL8); | 2346 ExpectValid(GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH24_STENCIL8); |
| 2347 ExpectValid(GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, | 2347 ExpectValid(GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, |
| 2348 GL_DEPTH32F_STENCIL8); | 2348 GL_DEPTH32F_STENCIL8); |
| 2349 | 2349 |
| 2350 ExpectInvalid(GL_RGB_INTEGER, GL_INT, GL_RGBA8); | 2350 ExpectInvalid(GL_RGB_INTEGER, GL_INT, GL_RGBA8); |
| 2351 } | 2351 } |
| 2352 | 2352 |
| 2353 } // namespace gles2 | 2353 } // namespace gles2 |
| 2354 } // namespace gpu | 2354 } // namespace gpu |
| OLD | NEW |