diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:03:42 -0700 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-10-17 19:09:42 -0700 |
| commit | 0072acd447dc6be652e63752e50215c3105322c8 (patch) | |
| tree | 847d1763b54772d336a04e606f8248291c3092b7 /src/glx/glxextensions.h | |
| parent | 543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff) | |
| parent | ca2b2ac131933b4171b519813df1aaa3a81621cd (diff) | |
Merge remote branch 'origin/master' into lp-setup-llvm
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
Diffstat (limited to 'src/glx/glxextensions.h')
| -rw-r--r-- | src/glx/glxextensions.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h index a11fe88ffc..7877661833 100644 --- a/src/glx/glxextensions.h +++ b/src/glx/glxextensions.h @@ -93,6 +93,7 @@ enum GL_ARB_texture_mirrored_repeat_bit, GL_ARB_texture_non_power_of_two_bit, GL_ARB_texture_rectangle_bit, + GL_ARB_texture_rg_bit, GL_ARB_transpose_matrix_bit, GL_ARB_vertex_buffer_object_bit, GL_ARB_vertex_program_bit, |