diff options
author | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-12 13:48:18 +0000 |
commit | e2c8d047679db3bbb166d709b86e18180be6d713 (patch) | |
tree | d7468ac76dc71bb8d38c816be6db988bcbcbb863 /mesalib/src/mesa/main/mfeatures.h | |
parent | 57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (diff) | |
parent | 7730393619080086530e24d3b594351b4114f608 (diff) | |
download | vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.gz vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.bz2 vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/mfeatures.h')
-rw-r--r-- | mesalib/src/mesa/main/mfeatures.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/mfeatures.h b/mesalib/src/mesa/main/mfeatures.h index b549d90bd..cdd6145ad 100644 --- a/mesalib/src/mesa/main/mfeatures.h +++ b/mesalib/src/mesa/main/mfeatures.h @@ -122,6 +122,7 @@ #define FEATURE_ARB_framebuffer_object (FEATURE_GL && FEATURE_EXT_framebuffer_object)
#define FEATURE_ARB_map_buffer_range FEATURE_GL
#define FEATURE_ARB_pixel_buffer_object (FEATURE_GL && FEATURE_EXT_pixel_buffer_object)
+#define FEATURE_ARB_sampler_objects FEATURE_GL
#define FEATURE_ARB_sync FEATURE_GL
#define FEATURE_ARB_vertex_buffer_object 1
|