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

Unified Diff: gpu/command_buffer/service/feature_info.cc

Issue 9965023: Merge 128403 - Modify gpu::gles2::FeatureInfo::AddFeatures to enable feature flags based on request… (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1025/src/
Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/feature_info.cc
===================================================================
--- gpu/command_buffer/service/feature_info.cc (revision 129880)
+++ gpu/command_buffer/service/feature_info.cc (working copy)
@@ -387,10 +387,10 @@
// 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");
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698