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

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

Issue 2291753002: Prevent crash when using getExtension while a PBO is bound. (Closed)
Patch Set: small corrections Created 4 years, 3 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
« no previous file with comments | « gpu/command_buffer/service/test_helper.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 TextureRef* texture_ref, GLenum pname, GLint value, GLenum error) { 105 TextureRef* texture_ref, GLenum pname, GLint value, GLenum error) {
106 TestHelper::SetTexParameteriWithExpectations( 106 TestHelper::SetTexParameteriWithExpectations(
107 gl_.get(), error_state_.get(), manager_.get(), 107 gl_.get(), error_state_.get(), manager_.get(),
108 texture_ref, pname, value, error); 108 texture_ref, pname, value, error);
109 } 109 }
110 110
111 void SetupFeatureInfo(const char* gl_extensions, 111 void SetupFeatureInfo(const char* gl_extensions,
112 const char* gl_version, 112 const char* gl_version,
113 bool enable_es3) { 113 bool enable_es3) {
114 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion( 114 TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
115 gl_.get(), gl_extensions, "", gl_version, enable_es3); 115 gl_.get(), gl_extensions, "", gl_version,
116 feature_info_->context_type(), enable_es3);
116 feature_info_->InitializeForTesting(); 117 feature_info_->InitializeForTesting();
117 if (enable_es3) { 118 if (enable_es3) {
118 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _)) 119 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS, _))
119 .WillOnce(SetArgPointee<1>(8)) 120 .WillOnce(SetArgPointee<1>(8))
120 .RetiresOnSaturation(); 121 .RetiresOnSaturation();
121 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_DRAW_BUFFERS, _)) 122 EXPECT_CALL(*gl_, GetIntegerv(GL_MAX_DRAW_BUFFERS, _))
122 .WillOnce(SetArgPointee<1>(8)) 123 .WillOnce(SetArgPointee<1>(8))
123 .RetiresOnSaturation(); 124 .RetiresOnSaturation();
124 feature_info_->EnableES3Validators(); 125 feature_info_->EnableES3Validators();
125 } 126 }
(...skipping 2620 matching lines...) Expand 10 before | Expand all | Expand 10 after
2746 ExpectValid( 2747 ExpectValid(
2747 true, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH24_STENCIL8); 2748 true, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, GL_DEPTH24_STENCIL8);
2748 ExpectValid(true, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV, 2749 ExpectValid(true, GL_DEPTH_STENCIL, GL_FLOAT_32_UNSIGNED_INT_24_8_REV,
2749 GL_DEPTH32F_STENCIL8); 2750 GL_DEPTH32F_STENCIL8);
2750 2751
2751 ExpectInvalid(true, GL_RGB_INTEGER, GL_INT, GL_RGBA8); 2752 ExpectInvalid(true, GL_RGB_INTEGER, GL_INT, GL_RGBA8);
2752 } 2753 }
2753 2754
2754 } // namespace gles2 2755 } // namespace gles2
2755 } // namespace gpu 2756 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/test_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698