diff options
| author | Marek Olšák <[email protected]> | 2019-06-11 18:27:04 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2019-06-21 19:00:52 -0400 |
| commit | 8ab9f3a857317b6556d4d58cfe9bf4e04192ebf2 (patch) | |
| tree | 73cefd7f88d42ef4252a1140f85805f360bc82fb /include/GLES/gl.h | |
| parent | a6bef350ed9a8802f72dc45023f5ec43ae199431 (diff) | |
include: update GL headers from the registry
Acked-by: Ilia Mirkin <[email protected]>
Diffstat (limited to 'include/GLES/gl.h')
| -rw-r--r-- | include/GLES/gl.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/include/GLES/gl.h b/include/GLES/gl.h index 44dcddc7528..47ddc7eb2dd 100644 --- a/include/GLES/gl.h +++ b/include/GLES/gl.h @@ -1,12 +1,12 @@ -#ifndef __gl_h_ -#define __gl_h_ 1 +#ifndef __gles1_gl_h_ +#define __gles1_gl_h_ 1 #ifdef __cplusplus extern "C" { #endif /* -** Copyright (c) 2013-2017 The Khronos Group Inc. +** Copyright (c) 2013-2018 The Khronos Group Inc. ** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the @@ -36,7 +36,7 @@ extern "C" { #include <GLES/glplatform.h> -/* Generated on date 20170606 */ +/* Generated on date 20190611 */ /* Generated C header for: * API: gles1 @@ -50,20 +50,11 @@ extern "C" { #ifndef GL_VERSION_ES_CM_1_0 #define GL_VERSION_ES_CM_1_0 1 - -/* - * XXX: Temporary fix; needs to be reverted as part of the next - * header update. - * For more details: - * https://github.com/KhronosGroup/OpenGL-Registry/pull/76 - * https://lists.freedesktop.org/archives/mesa-dev/2017-June/161647.html - */ #include <KHR/khrplatform.h> typedef khronos_int8_t GLbyte; typedef khronos_float_t GLclampf; -typedef short GLshort; -typedef unsigned short GLushort; - +typedef khronos_int16_t GLshort; +typedef khronos_uint16_t GLushort; typedef void GLvoid; typedef unsigned int GLenum; typedef khronos_float_t GLfloat; |