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

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

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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>
11 #include <map> 11 #include <map>
12 #include <stack> 12 #include <stack>
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/at_exit.h" 16 #include "base/at_exit.h"
17 #include "base/bind.h" 17 #include "base/bind.h"
18 #include "base/callback_helpers.h" 18 #include "base/callback_helpers.h"
19 #include "base/command_line.h" 19 #include "base/command_line.h"
20 #include "base/float_util.h"
21 #include "base/memory/scoped_ptr.h" 20 #include "base/memory/scoped_ptr.h"
22 #include "base/numerics/safe_math.h" 21 #include "base/numerics/safe_math.h"
23 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
24 #include "base/strings/string_split.h" 23 #include "base/strings/string_split.h"
25 #include "base/trace_event/trace_event.h" 24 #include "base/trace_event/trace_event.h"
26 #include "base/trace_event/trace_event_synthetic_delay.h" 25 #include "base/trace_event/trace_event_synthetic_delay.h"
27 #include "build/build_config.h" 26 #include "build/build_config.h"
28 #define GLES2_GPU_SERVICE 1 27 #define GLES2_GPU_SERVICE 1
29 #include "gpu/command_buffer/common/debug_marker_manager.h" 28 #include "gpu/command_buffer/common/debug_marker_manager.h"
30 #include "gpu/command_buffer/common/gles2_cmd_format.h" 29 #include "gpu/command_buffer/common/gles2_cmd_format.h"
(...skipping 12400 matching lines...) Expand 10 before | Expand all | Expand 10 after
12431 } 12430 }
12432 } 12431 }
12433 12432
12434 // Include the auto-generated part of this file. We split this because it means 12433 // Include the auto-generated part of this file. We split this because it means
12435 // we can easily edit the non-auto generated parts right here in this file 12434 // we can easily edit the non-auto generated parts right here in this file
12436 // instead of having to edit some template or the code generator. 12435 // instead of having to edit some template or the code generator.
12437 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 12436 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
12438 12437
12439 } // namespace gles2 12438 } // namespace gles2
12440 } // namespace gpu 12439 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698