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

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

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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
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
(...skipping 25 matching lines...) Expand all
36 typedef unsigned short GLushort; 36 typedef unsigned short GLushort;
37 typedef unsigned long GLulong; 37 typedef unsigned long GLulong;
38 typedef float GLfloat; 38 typedef float GLfloat;
39 typedef float GLclampf; 39 typedef float GLclampf;
40 typedef double GLdouble; 40 typedef double GLdouble;
41 typedef double GLclampd; 41 typedef double GLclampd;
42 typedef void GLvoid; 42 typedef void GLvoid;
43 typedef khronos_intptr_t GLintptr; 43 typedef khronos_intptr_t GLintptr;
44 typedef khronos_ssize_t GLsizeiptr; 44 typedef khronos_ssize_t GLsizeiptr;
45 typedef struct __GLsync *GLsync; 45 typedef struct __GLsync *GLsync;
46 typedef uint64_t GLuint64;
47 46
48 namespace gpu { 47 namespace gpu {
49 namespace gles2 { 48 namespace gles2 {
50 49
51 // Command buffer is GPU_COMMAND_BUFFER_ENTRY_ALIGNMENT byte aligned. 50 // Command buffer is GPU_COMMAND_BUFFER_ENTRY_ALIGNMENT byte aligned.
52 #pragma pack(push, GPU_COMMAND_BUFFER_ENTRY_ALIGNMENT) 51 #pragma pack(push, GPU_COMMAND_BUFFER_ENTRY_ALIGNMENT)
53 52
54 namespace id_namespaces { 53 namespace id_namespaces {
55 54
56 // These are used when contexts share resources. 55 // These are used when contexts share resources.
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 "offset of CreateAndConsumeTextureCHROMIUMImmediate.client_id should be 8"); 355 "offset of CreateAndConsumeTextureCHROMIUMImmediate.client_id should be 8");
357 356
358 357
359 #pragma pack(pop) 358 #pragma pack(pop)
360 359
361 } // namespace cmd 360 } // namespace cmd
362 } // namespace gles2 361 } // namespace gles2
363 } // namespace gpu 362 } // namespace gpu
364 363
365 #endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ 364 #endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/cmd_buffer_functions.txt ('k') | gpu/command_buffer/common/gles2_cmd_format_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698