diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 02:42:51 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 02:42:51 +0000 |
| commit | 67fe3095354f2d8cde66f36c582e357f38a6c847 (patch) | |
| tree | 005ec20df410b75b8ac9772e2979e04399bc551a /gpu/command_buffer/service | |
| parent | c1b747a2e13207a37407304746114bdf7f12cbb2 (diff) | |
| download | chromium_src-67fe3095354f2d8cde66f36c582e357f38a6c847.zip chromium_src-67fe3095354f2d8cde66f36c582e357f38a6c847.tar.gz chromium_src-67fe3095354f2d8cde66f36c582e357f38a6c847.tar.bz2 | |
Modify gpu::gles2::FeatureInfo::AddFeatures to enable feature flags based on requested features but not disable them.
BUG=112165
Review URL: https://chromiumcodereview.appspot.com/9837018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service')
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 9b83aca..606636c 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -389,10 +389,10 @@ void FeatureInfo::AddFeatures(const char* desired_features) { // GL_OES_depth32 // GL_OES_element_index_uint - feature_flags_.enable_texture_float_linear = enable_texture_float_linear; - feature_flags_.enable_texture_half_float_linear = + feature_flags_.enable_texture_float_linear |= enable_texture_float_linear; + feature_flags_.enable_texture_half_float_linear |= enable_texture_half_float_linear; - feature_flags_.npot_ok = npot_ok; + feature_flags_.npot_ok |= npot_ok; if (ext.HaveAndDesire("GL_CHROMIUM_post_sub_buffer")) { AddExtensionString("GL_CHROMIUM_post_sub_buffer"); |