diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-27 08:34:06 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-27 08:34:06 -0600 |
| commit | 7567f05199f1ca114cc57e3a11ac101d3707f819 (patch) | |
| tree | b8deb5a1e6d9480e533975cce095dcfbbf04e2bc /include/GL/glxext.h | |
| parent | db14a8022a2a957c83b1fe33a84af3cdb1952d68 (diff) | |
| parent | ea373df069aa734b4f59a5fbdbc304477a3613a0 (diff) | |
Merge branch '7.8'
Conflicts:
src/gallium/drivers/nv30/nv30_context.c
src/gallium/drivers/nv40/nv40_context.c
src/gallium/drivers/nv40/nv40_state_emit.c
Diffstat (limited to 'include/GL/glxext.h')
| -rw-r--r-- | include/GL/glxext.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/GL/glxext.h b/include/GL/glxext.h index 44224308f5..407d4f966e 100644 --- a/include/GL/glxext.h +++ b/include/GL/glxext.h @@ -124,6 +124,10 @@ extern "C" { #define GLX_SAMPLES_ARB 100001 #endif +#ifndef GLX_ARB_vertex_buffer_object +#define GLX_CONTEXT_ALLOW_BUFFER_BYTE_ORDER_MISMATCH_ARB 0x2095 +#endif + #ifndef GLX_ARB_fbconfig_float #define GLX_RGBA_FLOAT_TYPE_ARB 0x20B9 #define GLX_RGBA_FLOAT_BIT_ARB 0x00000004 |