X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fsampler.h;fp=source%2Fcore%2Fsampler.h;h=524a8fc5f95f01fbee29faa87a7f731c50b0e55d;hb=97b1f1d97b685155e279d9d02d7c6343ef233ae8;hp=43d1e5412a2fe3df0bb732ac42bc6b1344e1b003;hpb=4a639bc5e80fce2467855a9e8f4c6cdff2f0adc0;p=libs%2Fgl.git

diff --git a/source/core/sampler.h b/source/core/sampler.h
index 43d1e541..524a8fc5 100644
--- a/source/core/sampler.h
+++ b/source/core/sampler.h
@@ -12,38 +12,38 @@ namespace GL {
 enum TextureFilter
 {
 	/// No filtering
-	NEAREST = GL_NEAREST,
+	NEAREST,
 
 	/// Bilinear filtering
-	LINEAR = GL_LINEAR,
+	LINEAR,
 
 	/// Mipmapping without filtering
-	NEAREST_MIPMAP_NEAREST = GL_NEAREST_MIPMAP_NEAREST,
+	NEAREST_MIPMAP_NEAREST,
 
 	/// Linear filtering between two mipmap levels
-	NEAREST_MIPMAP_LINEAR = GL_NEAREST_MIPMAP_LINEAR,
+	NEAREST_MIPMAP_LINEAR,
 
 	/// Bilinear filtering on the closest mipmap level
-	LINEAR_MIPMAP_NEAREST = GL_LINEAR_MIPMAP_NEAREST,
+	LINEAR_MIPMAP_NEAREST,
 
 	/// Trilinear filtering between two mipmap levels
-	LINEAR_MIPMAP_LINEAR = GL_LINEAR_MIPMAP_LINEAR
+	LINEAR_MIPMAP_LINEAR
 };
 
 
 enum TextureWrap
 {
 	/// Tile the texture infinitely
-	REPEAT = GL_REPEAT,
+	REPEAT,
 
 	/// Extend the texels at the edge of the texture to infinity
-	CLAMP_TO_EDGE = GL_CLAMP_TO_EDGE,
+	CLAMP_TO_EDGE,
 
 	/// Sampling outside the texture will return border color
-	CLAMP_TO_BORDER = GL_CLAMP_TO_BORDER,
+	CLAMP_TO_BORDER,
 
 	/// Tile the texture, with every other repetition mirrored
-	MIRRORED_REPEAT = GL_MIRRORED_REPEAT
+	MIRRORED_REPEAT
 };
 
 
@@ -159,6 +159,8 @@ public:
 
 
 bool is_mipmapped(TextureFilter);
+GLenum get_gl_filter(TextureFilter);
+GLenum get_gl_wrap(TextureWrap);
 
 void operator>>(const LexicalConverter &, TextureFilter &);
 void operator>>(const LexicalConverter &, TextureWrap &);