diff options
Diffstat (limited to 'chromium/gpu/command_buffer/common/gles2_cmd_format.h')
| -rw-r--r-- | chromium/gpu/command_buffer/common/gles2_cmd_format.h | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/chromium/gpu/command_buffer/common/gles2_cmd_format.h b/chromium/gpu/command_buffer/common/gles2_cmd_format.h index 2e8fdf9b544..7bb5aef6f09 100644 --- a/chromium/gpu/command_buffer/common/gles2_cmd_format.h +++ b/chromium/gpu/command_buffer/common/gles2_cmd_format.h @@ -7,9 +7,6 @@ #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ - -#include <KHR/khrplatform.h> - #include <stddef.h> #include <stdint.h> #include <string.h> @@ -20,34 +17,10 @@ #include "gpu/command_buffer/common/bitfield_helpers.h" #include "gpu/command_buffer/common/cmd_buffer_common.h" #include "gpu/command_buffer/common/constants.h" +#include "gpu/command_buffer/common/gl2_types.h" #include "gpu/command_buffer/common/gles2_cmd_ids.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" -// GL types are forward declared to avoid including the GL headers. The problem -// is determining which GL headers to include from code that is common to the -// client and service sides (GLES2 or one of several GL implementations). -typedef unsigned int GLenum; -typedef unsigned int GLbitfield; -typedef unsigned int GLuint; -typedef int GLint; -typedef int GLsizei; -typedef unsigned char GLboolean; -typedef signed char GLbyte; -typedef short GLshort; -typedef unsigned char GLubyte; -typedef unsigned short GLushort; -typedef unsigned long GLulong; -typedef float GLfloat; -typedef float GLclampf; -typedef double GLdouble; -typedef double GLclampd; -typedef void GLvoid; -typedef khronos_intptr_t GLintptr; -typedef khronos_ssize_t GLsizeiptr; -typedef struct __GLsync *GLsync; -typedef int64_t GLint64; -typedef uint64_t GLuint64; - namespace gpu { namespace gles2 { |