Add .sampled() methods to textures

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## Unreleased
+
+ - Textures now have a `sampled()` method to make it easier to create a `Sampler`.
+
 ## Version 0.3.6 (2015-05-09)
 
  - Added `SamplesPassedQuery` and `TimeElapsedQuery` types. They can be passed to the draw parameters.

build/textures.rs

@@ -317,6 +317,27 @@ fn build_texture<W: Write>(mut dest: &mut W, ty: TextureType, dimensions: Textur
                                     UniformValue::{myname}(self.0, Some(self.1))
                                 }}
                             }}
+
+                            impl {myname} {{
+                                /// Builds a `Sampler` marker object that allows you to indicate
+                                /// how the texture should be sampled from inside a shader.
+                                ///
+                                /// # Example
+                                ///
+                                /// ```no_run
+                                /// # #[macro_use] extern crate glium;
+                                /// # fn main() {{
+                                /// # let texture: glium::textures::Texture2d = unsafe {{
+                                /// # ::std::mem::uninitialized() }};
+                                /// let uniforms = uniform! {{
+                                ///     color_texture: texture.sampled().magnify_filter(glium::uniforms::MagnifySamplerFilter::Nearest)
+                                /// }};
+                                /// # }}
+                                /// ```
+                                pub fn sampled(&self) -> Sampler<{myname}> {{
+                                    Sampler(self, Default::default())
+                                }}
+                            }}
                         ", myname = name)).unwrap();
             },
             _ => ()

tests/samplers.rs

@@ -63,8 +63,7 @@ fn magnify_nearest_filtering() {
     let texture = glium::texture::Texture2d::new(&display, texture_data);
 
     let uniforms = uniform! {
-        texture: glium::uniforms::Sampler::new(&texture)
-                        .magnify_filter(glium::uniforms::MagnifySamplerFilter::Nearest)
+        texture: texture.sampled().magnify_filter(glium::uniforms::MagnifySamplerFilter::Nearest)
     };
 
     let output = support::build_renderable_texture(&display);