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

Side by Side Diff: gpu/command_buffer/common/gles2_cmd_format.h

Issue 862133002: Update from https://crrev.com/312398 (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 // This file defines the GLES2 command buffer commands. 5 // This file defines the GLES2 command buffer commands.
6 6
7 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ 7 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
8 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ 8 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
9 9
10 10
11 #include <KHR/khrplatform.h> 11 #include <KHR/khrplatform.h>
12 12
13 #include <stdint.h> 13 #include <stdint.h>
14 #include <string.h> 14 #include <string.h>
15 15
16 #include "base/atomicops.h" 16 #include "base/atomicops.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/macros.h" 18 #include "base/macros.h"
19 #include "gpu/command_buffer/common/bitfield_helpers.h" 19 #include "gpu/command_buffer/common/bitfield_helpers.h"
20 #include "gpu/command_buffer/common/cmd_buffer_common.h" 20 #include "gpu/command_buffer/common/cmd_buffer_common.h"
21 #include "gpu/command_buffer/common/gles2_cmd_ids.h" 21 #include "gpu/command_buffer/common/gles2_cmd_ids.h"
22 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
22 23
23 // GL types are forward declared to avoid including the GL headers. The problem 24 // GL types are forward declared to avoid including the GL headers. The problem
24 // is determining which GL headers to include from code that is common to the 25 // is determining which GL headers to include from code that is common to the
25 // client and service sides (GLES2 or one of several GL implementations). 26 // client and service sides (GLES2 or one of several GL implementations).
26 typedef unsigned int GLenum; 27 typedef unsigned int GLenum;
27 typedef unsigned int GLbitfield; 28 typedef unsigned int GLbitfield;
28 typedef unsigned int GLuint; 29 typedef unsigned int GLuint;
29 typedef int GLint; 30 typedef int GLint;
30 typedef int GLsizei; 31 typedef int GLsizei;
31 typedef unsigned char GLboolean; 32 typedef unsigned char GLboolean;
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 "offset of CreateAndConsumeTextureCHROMIUMImmediate.client_id should be 8"); 275 "offset of CreateAndConsumeTextureCHROMIUMImmediate.client_id should be 8");
275 276
276 277
277 #pragma pack(pop) 278 #pragma pack(pop)
278 279
279 } // namespace cmd 280 } // namespace cmd
280 } // namespace gles2 281 } // namespace gles2
281 } // namespace gpu 282 } // namespace gpu
282 283
283 #endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ 284 #endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698