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

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

Issue 557087: Fixed compile error for unit-tests on linux. We do not include any glew file ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 10 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
« no previous file with comments | « gpu/command_buffer/service/gl_utils.h ('k') | gpu/command_buffer/service/x_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 <vector> 9 #include <vector>
10 #include <string> 10 #include <string>
11 #include <map> 11 #include <map>
12 #include <build/build_config.h> 12 #include <build/build_config.h>
13 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
14 #define GLES2_GPU_SERVICE 1 14 #define GLES2_GPU_SERVICE 1
15 #include "gpu/command_buffer/common/gles2_cmd_format.h" 15 #include "gpu/command_buffer/common/gles2_cmd_format.h"
16 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 16 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
17 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 17 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
18 #include "gpu/command_buffer/service/gl_utils.h" 18 #include "gpu/command_buffer/service/gl_utils.h"
19 #include "gpu/command_buffer/service/gles2_cmd_validation.h" 19 #include "gpu/command_buffer/service/gles2_cmd_validation.h"
20 #if defined(OS_LINUX) 20 #if defined(OS_LINUX) && !defined(UNIT_TEST)
21 // XWindowWrapper is stubbed out for unit-tests.
21 #include "gpu/command_buffer/service/x_utils.h" 22 #include "gpu/command_buffer/service/x_utils.h"
22 #endif 23 #endif
23 24
24 namespace gpu { 25 namespace gpu {
25 namespace gles2 { 26 namespace gles2 {
26 27
27 // Check that certain assumptions the code makes are true. There are places in 28 // Check that certain assumptions the code makes are true. There are places in
28 // the code where shared memory is passed direclty to GL. Example, glUniformiv, 29 // the code where shared memory is passed direclty to GL. Example, glUniformiv,
29 // glShaderSource. The command buffer code assumes GLint and GLsizei (and maybe 30 // glShaderSource. The command buffer code assumes GLint and GLsizei (and maybe
30 // a few others) are 32bits. If they are not 32bits the code will have to change 31 // a few others) are 32bits. If they are not 32bits the code will have to change
(...skipping 1873 matching lines...) Expand 10 before | Expand all | Expand 10 after
1904 return parse_error::kParseNoError; 1905 return parse_error::kParseNoError;
1905 } 1906 }
1906 1907
1907 // Include the auto-generated part of this file. We split this because it means 1908 // Include the auto-generated part of this file. We split this because it means
1908 // we can easily edit the non-auto generated parts right here in this file 1909 // we can easily edit the non-auto generated parts right here in this file
1909 // instead of having to edit some template or the code generator. 1910 // instead of having to edit some template or the code generator.
1910 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 1911 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
1911 1912
1912 } // namespace gles2 1913 } // namespace gles2
1913 } // namespace gpu 1914 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/gl_utils.h ('k') | gpu/command_buffer/service/x_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698