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

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

Issue 6722026: Refactor: Move app/gfx/gl ==> ui/gfx/gl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Try removing a dep. Created 9 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "app/gfx/gl/gl_context.h"
16 #include "app/gfx/gl/gl_implementation.h"
17 #include "base/atomicops.h" 15 #include "base/atomicops.h"
18 #include "base/at_exit.h" 16 #include "base/at_exit.h"
19 #include "base/callback.h" 17 #include "base/callback.h"
20 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
21 #include "base/memory/weak_ptr.h" 19 #include "base/memory/weak_ptr.h"
22 #include "build/build_config.h" 20 #include "build/build_config.h"
23 #define GLES2_GPU_SERVICE 1 21 #define GLES2_GPU_SERVICE 1
24 #include "gpu/command_buffer/common/gles2_cmd_format.h" 22 #include "gpu/command_buffer/common/gles2_cmd_format.h"
25 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 23 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
26 #include "gpu/command_buffer/common/id_allocator.h" 24 #include "gpu/command_buffer/common/id_allocator.h"
27 #include "gpu/command_buffer/service/buffer_manager.h" 25 #include "gpu/command_buffer/service/buffer_manager.h"
28 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 26 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
29 #include "gpu/command_buffer/service/context_group.h" 27 #include "gpu/command_buffer/service/context_group.h"
30 #include "gpu/command_buffer/service/feature_info.h" 28 #include "gpu/command_buffer/service/feature_info.h"
31 #include "gpu/command_buffer/service/framebuffer_manager.h" 29 #include "gpu/command_buffer/service/framebuffer_manager.h"
32 #include "gpu/command_buffer/service/gl_utils.h" 30 #include "gpu/command_buffer/service/gl_utils.h"
33 #include "gpu/command_buffer/service/gles2_cmd_validation.h" 31 #include "gpu/command_buffer/service/gles2_cmd_validation.h"
34 #include "gpu/command_buffer/service/program_manager.h" 32 #include "gpu/command_buffer/service/program_manager.h"
35 #include "gpu/command_buffer/service/renderbuffer_manager.h" 33 #include "gpu/command_buffer/service/renderbuffer_manager.h"
36 #include "gpu/command_buffer/service/shader_manager.h" 34 #include "gpu/command_buffer/service/shader_manager.h"
37 #include "gpu/command_buffer/service/shader_translator.h" 35 #include "gpu/command_buffer/service/shader_translator.h"
38 #include "gpu/command_buffer/service/texture_manager.h" 36 #include "gpu/command_buffer/service/texture_manager.h"
39 #include "gpu/GLES2/gles2_command_buffer.h" 37 #include "gpu/GLES2/gles2_command_buffer.h"
38 #include "ui/gfx/gl/gl_context.h"
39 #include "ui/gfx/gl/gl_implementation.h"
40 40
41 #if !defined(GL_DEPTH24_STENCIL8) 41 #if !defined(GL_DEPTH24_STENCIL8)
42 #define GL_DEPTH24_STENCIL8 0x88F0 42 #define GL_DEPTH24_STENCIL8 0x88F0
43 #endif 43 #endif
44 44
45 namespace gpu { 45 namespace gpu {
46 namespace gles2 { 46 namespace gles2 {
47 47
48 class GLES2DecoderImpl; 48 class GLES2DecoderImpl;
49 49
(...skipping 6340 matching lines...) Expand 10 before | Expand all | Expand 10 after
6390 return error::kNoError; 6390 return error::kNoError;
6391 } 6391 }
6392 6392
6393 // Include the auto-generated part of this file. We split this because it means 6393 // Include the auto-generated part of this file. We split this because it means
6394 // we can easily edit the non-auto generated parts right here in this file 6394 // we can easily edit the non-auto generated parts right here in this file
6395 // instead of having to edit some template or the code generator. 6395 // instead of having to edit some template or the code generator.
6396 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 6396 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
6397 6397
6398 } // namespace gles2 6398 } // namespace gles2
6399 } // namespace gpu 6399 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gl_utils.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698