summaryrefslogtreecommitdiff
path: root/src/mapi
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-06-25 10:35:37 -0600
committerBrian Paul <brianp@vmware.com>2013-06-26 10:43:27 -0600
commit9a14e412d6de93349a490a9c4534b52c3b524ee9 (patch)
tree7d47caac4f7a4f02d79f2fe5ea05a65c5ce98d81 /src/mapi
parentbc6eb8068ff2faed93b79d5858c223da9d0c7689 (diff)
mesa: update glext.h to version 20130624
In glapi_priv.h we always need the typedef for the GLclampx type since GL_OES_fixed_point is now defined in glext.h but the GLclampx type is not. GLclampx is not used by anything in glext.h but we need it for GL ES dispatch. This is a huge patch because the structure of the file has been changed. The following extensions are new, however: GL_AMD_interleaved_elements GL_AMD_shader_trinary_minmax GL_IBM_static_data GL_INTEL_map_texture GL_NV_compute_program5 GL_NV_deep_texture3D GL_NV_draw_texture GL_NV_shader_atomic_counters GL_NV_shader_storage_buffer_object GL_NVX_conditional_render GL_OES_byte_coordinates GL_OES_compressed_paletted_texture GL_OES_fixed_point GL_OES_query_matrix GL_OES_single_precision And these extensions were removed: GL_FfdMaskSGIX GL_INGR_palette_buffer GL_INTEL_texture_scissor GL_SGI_depth_pass_instrument GL_SGIX_fog_scale GL_SGIX_impact_pixel_texture GL_SGIX_texture_select Reviewed-by: José Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/mapi')
-rw-r--r--src/mapi/glapi/glapi_priv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mapi/glapi/glapi_priv.h b/src/mapi/glapi/glapi_priv.h
index 795e0a200cc..92925faacca 100644
--- a/src/mapi/glapi/glapi_priv.h
+++ b/src/mapi/glapi/glapi_priv.h
@@ -40,8 +40,8 @@
#ifndef GL_OES_fixed_point
typedef int GLfixed;
-typedef int GLclampx;
#endif
+typedef int GLclampx;
#ifndef GL_OES_EGL_image
typedef void *GLeglImageOES;