diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-04 13:16:13 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-04 13:16:13 -0600 |
| commit | 9d58724c51c387c360d2423e29b80ddc0bfa66b7 (patch) | |
| tree | 774f69454bca802e1fe8e20ebb2a130843ca8123 /src/mesa/main/mfeatures.h | |
| parent | 81a0ef3f2068448a8b544826eaa7d3382b9c769b (diff) | |
| parent | 9424d81d18770f0c436f0876dffe07cf7c094db4 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/context.c
Diffstat (limited to 'src/mesa/main/mfeatures.h')
| -rw-r--r-- | src/mesa/main/mfeatures.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index f570647942..62c3ead3e1 100644 --- a/src/mesa/main/mfeatures.h +++ b/src/mesa/main/mfeatures.h @@ -61,6 +61,7 @@ #define FEATURE_ARB_occlusion_query _HAVE_FULL_GL #define FEATURE_ARB_fragment_program _HAVE_FULL_GL #define FEATURE_ARB_framebuffer_object _HAVE_FULL_GL +#define FEATURE_ARB_pixel_buffer_object _HAVE_FULL_GL #define FEATURE_ARB_vertex_buffer_object _HAVE_FULL_GL #define FEATURE_ARB_vertex_program _HAVE_FULL_GL #define FEATURE_ARB_vertex_shader _HAVE_FULL_GL |