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

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

Issue 833243008: Update from https://crrev.com/311145 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
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/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 9864 matching lines...) Expand 10 before | Expand all | Expand 10 after
9875 } 9875 }
9876 std::string feature_str; 9876 std::string feature_str;
9877 if (!bucket->GetAsString(&feature_str)) { 9877 if (!bucket->GetAsString(&feature_str)) {
9878 return error::kInvalidArguments; 9878 return error::kInvalidArguments;
9879 } 9879 }
9880 9880
9881 // TODO(gman): make this some kind of table to function pointer thingy. 9881 // TODO(gman): make this some kind of table to function pointer thingy.
9882 if (feature_str.compare("pepper3d_allow_buffers_on_multiple_targets") == 0) { 9882 if (feature_str.compare("pepper3d_allow_buffers_on_multiple_targets") == 0) {
9883 buffer_manager()->set_allow_buffers_on_multiple_targets(true); 9883 buffer_manager()->set_allow_buffers_on_multiple_targets(true);
9884 } else if (feature_str.compare("pepper3d_support_fixed_attribs") == 0) { 9884 } else if (feature_str.compare("pepper3d_support_fixed_attribs") == 0) {
9885 buffer_manager()->set_allow_buffers_on_multiple_targets(true); 9885 buffer_manager()->set_allow_fixed_attribs(true);
9886 // TODO(gman): decide how to remove the need for this const_cast. 9886 // TODO(gman): decide how to remove the need for this const_cast.
9887 // I could make validators_ non const but that seems bad as this is the only 9887 // I could make validators_ non const but that seems bad as this is the only
9888 // place it is needed. I could make some special friend class of validators 9888 // place it is needed. I could make some special friend class of validators
9889 // just to allow this to set them. That seems silly. I could refactor this 9889 // just to allow this to set them. That seems silly. I could refactor this
9890 // code to use the extension mechanism or the initialization attributes to 9890 // code to use the extension mechanism or the initialization attributes to
9891 // turn this feature on. Given that the only real point of this is to make 9891 // turn this feature on. Given that the only real point of this is to make
9892 // the conformance tests pass and given that there is lots of real work that 9892 // the conformance tests pass and given that there is lots of real work that
9893 // needs to be done it seems like refactoring for one to one of those 9893 // needs to be done it seems like refactoring for one to one of those
9894 // methods is a very low priority. 9894 // methods is a very low priority.
9895 const_cast<Validators*>(validators_)->vertex_attrib_type.AddValue(GL_FIXED); 9895 const_cast<Validators*>(validators_)->vertex_attrib_type.AddValue(GL_FIXED);
(...skipping 1739 matching lines...) Expand 10 before | Expand all | Expand 10 after
11635 } 11635 }
11636 } 11636 }
11637 11637
11638 // Include the auto-generated part of this file. We split this because it means 11638 // Include the auto-generated part of this file. We split this because it means
11639 // we can easily edit the non-auto generated parts right here in this file 11639 // we can easily edit the non-auto generated parts right here in this file
11640 // instead of having to edit some template or the code generator. 11640 // instead of having to edit some template or the code generator.
11641 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 11641 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
11642 11642
11643 } // namespace gles2 11643 } // namespace gles2
11644 } // namespace gpu 11644 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/feature_info.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698