[cairo-commit] glitz/src glitz.h, 1.38, 1.39 glitz_gl.h, 1.18, 1.19 glitz_texture.c, 1.22, 1.23

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz/src
In directory kemper:/tmp/cvs-serv10651/src

Modified Files:
	glitz.h glitz_gl.h glitz_texture.c 
Log Message:
Mipmap support

Index: glitz.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- glitz.h	16 Feb 2006 02:59:59 -0000	1.38
+++ glitz.h	23 Feb 2006 01:21:11 -0000	1.39
@@ -28,7 +28,7 @@
 
 #define GLITZ_MAJOR    0
 #define GLITZ_MINOR    5
-#define GLITZ_REVISION 3
+#define GLITZ_REVISION 4
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -397,8 +397,12 @@
 } glitz_texture_filter_type_t;
 
 typedef enum {
-  GLITZ_TEXTURE_FILTER_NEAREST = 0,
-  GLITZ_TEXTURE_FILTER_LINEAR  = 1
+  GLITZ_TEXTURE_FILTER_NEAREST		      = 0,
+  GLITZ_TEXTURE_FILTER_LINEAR		      = 1,
+  GLITZ_TEXTURE_FILTER_NEAREST_MIPMAP_NEAREST = 2,
+  GLITZ_TEXTURE_FILTER_LINEAR_MIPMAP_NEAREST  = 3,
+  GLITZ_TEXTURE_FILTER_NEAREST_MIPMAP_LINEAR  = 3,
+  GLITZ_TEXTURE_FILTER_LINEAR_MIPMAP_LINEAR   = 4
 } glitz_texture_filter_t;
 
 void

Index: glitz_gl.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_gl.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- glitz_gl.h	29 Nov 2005 22:41:27 -0000	1.18
+++ glitz_gl.h	23 Feb 2006 01:21:11 -0000	1.19
@@ -145,6 +145,11 @@
 #define GLITZ_GL_TEXTURE_BLUE_SIZE      0x805E
 #define GLITZ_GL_TEXTURE_ALPHA_SIZE     0x805F
 
+#define GLITZ_GL_NEAREST_MIPMAP_NEAREST 0x2700
+#define GLITZ_GL_LINEAR_MIPMAP_NEAREST  0x2701
+#define GLITZ_GL_NEAREST_MIPMAP_LINEAR  0x2702
+#define GLITZ_GL_LINEAR_MIPMAP_LINEAR   0x2703
+
 #define GLITZ_GL_TEXTURE        0x1702
 #define GLITZ_GL_SRC_COLOR      0x0300
 

Index: glitz_texture.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_texture.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- glitz_texture.c	16 Feb 2006 02:57:51 -0000	1.22
+++ glitz_texture.c	23 Feb 2006 01:21:11 -0000	1.23
@@ -388,12 +388,25 @@
 				 glitz_texture_filter_type_t type,
 				 glitz_texture_filter_t      filter)
 {
-    static glitz_gl_enum_t filters[] = {
-	GLITZ_GL_NEAREST,
-	GLITZ_GL_LINEAR
+    static glitz_gl_enum_t filters[2][6] = {
+	{
+	    GLITZ_GL_NEAREST,
+	    GLITZ_GL_LINEAR,
+	    GLITZ_GL_NEAREST,
+	    GLITZ_GL_LINEAR,
+	    GLITZ_GL_NEAREST,
+	    GLITZ_GL_LINEAR
+	}, {
+	    GLITZ_GL_NEAREST,
+	    GLITZ_GL_LINEAR,
+	    GLITZ_GL_NEAREST_MIPMAP_NEAREST,
+	    GLITZ_GL_LINEAR_MIPMAP_NEAREST,
+	    GLITZ_GL_NEAREST_MIPMAP_LINEAR,
+	    GLITZ_GL_LINEAR_MIPMAP_LINEAR
+	}
     };
 
-    texture->param.filter[type] = filters[filter];
+    texture->param.filter[type] = filters[type][filter];
 }
 
 void