[cairo-commit] glitz/src/glx glitz-glx.h, 1.1, 1.2 glitz_glx_context.c, 1.1, 1.2 glitz_glx_drawable.c, 1.1, 1.2 glitz_glx_extension.c, 1.1, 1.2 glitz_glx_format.c, 1.1, 1.2 glitz_glx_info.c, 1.1, 1.2 glitz_glx_pbuffer.c, 1.1, 1.2 glitz_glxext.h, 1.1, 1.2 glitz_glxint.h, 1.1, 1.2

David Reveman commit at pdx.freedesktop.org
Tue Jan 25 11:50:28 PST 2005


Committed by: davidr

Update of /cvs/cairo/glitz/src/glx
In directory gabe:/tmp/cvs-serv2384/src/glx

Modified Files:
	glitz-glx.h glitz_glx_context.c glitz_glx_drawable.c 
	glitz_glx_extension.c glitz_glx_format.c glitz_glx_info.c 
	glitz_glx_pbuffer.c glitz_glxext.h glitz_glxint.h 
Log Message:
Add anti-aliased trapezoids, rectangular clipping, multiple geometry arrays, bitmap geometry, mask surface convolution filtering

Index: glitz-glx.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz-glx.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz-glx.h	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz-glx.h	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,11 +1,11 @@
 /*
- * Copyright © 2004 David Reveman
+ * Copyright © 2004 David Reveman
  * 
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
  * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the names of
+ * appear in supporting documentation, and that the name of
  * David Reveman not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
  * David Reveman makes no representations about the suitability of this
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <c99drn at cs.umu.se>
+ * Author: David Reveman <davidr at novell.com>
  */
 
 #ifndef GLITZ_GLX_H_INCLUDED
@@ -66,15 +66,15 @@
                                       int                     screen,
                                       glitz_drawable_format_t *format,
                                       Window                  window,
-                                      int                     width,
-                                      int                     height);
+                                      unsigned int            width,
+                                      unsigned int            height);
 
 glitz_drawable_t *
-glitz_glx_create_pbuffer_drawable (Display                    *display,
-                                   int                        screen,
-                                   glitz_drawable_format_t    *format,
-                                   glitz_pbuffer_attributes_t *attributes,
-                                   unsigned long              mask);
+glitz_glx_create_pbuffer_drawable (Display                 *display,
+                                   int                     screen,
+                                   glitz_drawable_format_t *format,
+                                   unsigned int            width,
+                                   unsigned int            height);
 
 
 #if defined(__cplusplus) || defined(c_plusplus)

Index: glitz_glx_context.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glx_context.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_glx_context.c	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz_glx_context.c	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,11 +1,11 @@
 /*
- * Copyright © 2004 David Reveman
+ * Copyright © 2004 David Reveman
  * 
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
  * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the names of
+ * appear in supporting documentation, and that the name of
  * David Reveman not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
  * David Reveman makes no representations about the suitability of this
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <c99drn at cs.umu.se>
+ * Author: David Reveman <davidr at novell.com>
  */
 
 #ifdef HAVE_CONFIG_H

Index: glitz_glx_drawable.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glx_drawable.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_glx_drawable.c	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz_glx_drawable.c	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,11 +1,11 @@
 /*
- * Copyright © 2004 David Reveman
+ * Copyright © 2004 David Reveman
  * 
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
  * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the names of
+ * appear in supporting documentation, and that the name of
  * David Reveman not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
  * David Reveman makes no representations about the suitability of this
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <c99drn at cs.umu.se>
+ * Author: David Reveman <davidr at novell.com>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -80,14 +80,13 @@
 }
 
 static glitz_drawable_t *
-_glitz_glx_create_pbuffer_drawable (glitz_glx_screen_info_t    *screen_info,
-                                    glitz_drawable_format_t    *format,
-                                    glitz_pbuffer_attributes_t *attributes,
-                                    unsigned long              mask)
+_glitz_glx_create_pbuffer_drawable (glitz_glx_screen_info_t *screen_info,
+                                    glitz_drawable_format_t *format,
+                                    unsigned int            width,
+                                    unsigned int            height)
 {
   glitz_glx_drawable_t *drawable;
   glitz_glx_context_t *context;
-  unsigned int width, height;
   GLXPbuffer pbuffer;
 
   if (!format->types.pbuffer)
@@ -98,8 +97,7 @@
     return NULL;
 
   pbuffer = glitz_glx_pbuffer_create (screen_info, context->fbconfig,
-                                      attributes, mask,
-                                      &width, &height);
+                                      (int) width, (int) height);
   if (!pbuffer)
     return NULL;
   
@@ -115,15 +113,15 @@
 }
 
 glitz_drawable_t *
-glitz_glx_create_pbuffer (void                       *abstract_templ,
-                          glitz_drawable_format_t    *format,
-                          glitz_pbuffer_attributes_t *attributes,
-                          unsigned long              mask)
+glitz_glx_create_pbuffer (void                    *abstract_templ,
+                          glitz_drawable_format_t *format,
+                          unsigned int            width,
+                          unsigned int            height)
 {
   glitz_glx_drawable_t *templ = (glitz_glx_drawable_t *) abstract_templ;
 
   return _glitz_glx_create_pbuffer_drawable (templ->screen_info, format,
-                                             attributes, mask);
+                                             width, height);
 }
 
 glitz_drawable_t *
@@ -131,8 +129,8 @@
                                       int                     screen,
                                       glitz_drawable_format_t *format,
                                       Window                  window,
-                                      int                     width,
-                                      int                     height)
+                                      unsigned int            width,
+                                      unsigned int            height)
 {
   glitz_glx_drawable_t *drawable;
   glitz_glx_screen_info_t *screen_info;
@@ -157,11 +155,11 @@
 slim_hidden_def(glitz_glx_create_drawable_for_window);
 
 glitz_drawable_t *
-glitz_glx_create_pbuffer_drawable (Display                    *display,
-                                   int                        screen,
-                                   glitz_drawable_format_t    *format,
-                                   glitz_pbuffer_attributes_t *attributes,
-                                   unsigned long              mask)
+glitz_glx_create_pbuffer_drawable (Display                 *display,
+                                   int                     screen,
+                                   glitz_drawable_format_t *format,
+                                   unsigned int            width,
+                                   unsigned int            height)
 {
   glitz_glx_screen_info_t *screen_info;
 
@@ -170,7 +168,7 @@
     return NULL;
 
   return _glitz_glx_create_pbuffer_drawable (screen_info, format,
-                                             attributes, mask);
+                                             width, height);
 }
 slim_hidden_def(glitz_glx_create_pbuffer_drawable);
 

Index: glitz_glx_extension.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glx_extension.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_glx_extension.c	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz_glx_extension.c	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,11 +1,11 @@
 /*
- * Copyright © 2004 David Reveman
+ * Copyright © 2004 David Reveman
  * 
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
  * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the names of
+ * appear in supporting documentation, and that the name of
  * David Reveman not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
  * David Reveman makes no representations about the suitability of this
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <c99drn at cs.umu.se>
+ * Author: David Reveman <davidr at novell.com>
  */
 
 #ifdef HAVE_CONFIG_H

Index: glitz_glx_format.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glx_format.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_glx_format.c	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz_glx_format.c	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,11 +1,11 @@
 /*
- * Copyright © 2004 David Reveman
+ * Copyright © 2004 David Reveman
  * 
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
  * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the names of
+ * appear in supporting documentation, and that the name of
  * David Reveman not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
  * David Reveman makes no representations about the suitability of this
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <c99drn at cs.umu.se>
+ * Author: David Reveman <davidr at novell.com>
  */
 
 #ifdef HAVE_CONFIG_H

Index: glitz_glx_info.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glx_info.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_glx_info.c	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz_glx_info.c	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,11 +1,11 @@
 /*
- * Copyright © 2004 David Reveman
+ * Copyright © 2004 David Reveman
  * 
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
  * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the names of
+ * appear in supporting documentation, and that the name of
  * David Reveman not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
  * David Reveman makes no representations about the suitability of this
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <c99drn at cs.umu.se>
+ * Author: David Reveman <davidr at novell.com>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -42,6 +42,7 @@
   (glitz_gl_enable_client_state_t) glEnableClientState,
   (glitz_gl_disable_client_state_t) glDisableClientState,
   (glitz_gl_vertex_pointer_t) glVertexPointer,
+  (glitz_gl_tex_coord_pointer_t) glTexCoordPointer,
   (glitz_gl_draw_arrays_t) glDrawArrays,
   (glitz_gl_tex_env_f_t) glTexEnvf,
   (glitz_gl_tex_env_fv_t) glTexEnvfv,
@@ -96,6 +97,8 @@
   /* extensions */
   (glitz_gl_blend_color_t) 0,
   (glitz_gl_active_texture_t) 0,
+  (glitz_gl_client_active_texture_t) 0,
+  (glitz_gl_multi_draw_arrays_t) 0,
   (glitz_gl_gen_programs_t) 0,
   (glitz_gl_delete_programs_t) 0,
   (glitz_gl_program_string_t) 0,

Index: glitz_glx_pbuffer.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glx_pbuffer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_glx_pbuffer.c	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz_glx_pbuffer.c	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,11 +1,11 @@
 /*
- * Copyright © 2004 David Reveman
+ * Copyright © 2004 David Reveman
  * 
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
  * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the names of
+ * appear in supporting documentation, and that the name of
  * David Reveman not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
  * David Reveman makes no representations about the suitability of this
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <c99drn at cs.umu.se>
+ * Author: David Reveman <davidr at novell.com>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -30,49 +30,30 @@
 #include "glitz_glxint.h"
 
 GLXPbuffer
-glitz_glx_pbuffer_create (glitz_glx_screen_info_t    *screen_info,
-                          GLXFBConfig                fbconfig,
-                          glitz_pbuffer_attributes_t *attributes,
-                          unsigned long              mask,
-                          unsigned int               *width,
-                          unsigned int               *height)
+glitz_glx_pbuffer_create (glitz_glx_screen_info_t *screen_info,
+                          GLXFBConfig             fbconfig,
+                          int                     width,
+                          int                     height)
 {
   if (fbconfig) {
-    GLXPbuffer pbuffer;
-    int pbuffer_attr[13];
-    int i = 0;
+    int attributes[9];
 
-    pbuffer_attr[i++] = GLX_PBUFFER_WIDTH;
-    if (mask & GLITZ_PBUFFER_WIDTH_MASK)
-      pbuffer_attr[i++] = attributes->width;
-    else
-      pbuffer_attr[i++] = GLITZ_DEFAULT_PBUFFER_WIDTH;
+    attributes[0] = GLX_PBUFFER_WIDTH;
+    attributes[1] = width;
 
-    pbuffer_attr[i++] = GLX_PBUFFER_HEIGHT;
-    if (mask & GLITZ_PBUFFER_HEIGHT_MASK)
-      pbuffer_attr[i++] = attributes->height;
-    else
-      pbuffer_attr[i++] = GLITZ_DEFAULT_PBUFFER_HEIGHT;
+    attributes[2] = GLX_PBUFFER_HEIGHT;
+    attributes[3] = height;
     
-    pbuffer_attr[i++] = GLX_LARGEST_PBUFFER;
-    pbuffer_attr[i++] = 1;
-
-    pbuffer_attr[i++] = GLX_PRESERVED_CONTENTS;
-    pbuffer_attr[i++] = 1;
-    pbuffer_attr[i++] = 0;
-
-    pbuffer =
-      screen_info->glx.create_pbuffer (screen_info->display_info->display,
-                                       fbconfig, pbuffer_attr);
-    if (!pbuffer)
-      return (GLXPbuffer) 0;
+    attributes[4] = GLX_LARGEST_PBUFFER;
+    attributes[5] = 0;
 
-    screen_info->glx.query_drawable (screen_info->display_info->display,
-                                     pbuffer, GLX_WIDTH, width);
+    attributes[6] = GLX_PRESERVED_CONTENTS;
+    attributes[7] = 1;
+    attributes[8] = 0;
 
-    screen_info->glx.query_drawable (screen_info->display_info->display,
-                                     pbuffer, GLX_HEIGHT, height);
-    return pbuffer;
+    return
+        screen_info->glx.create_pbuffer (screen_info->display_info->display,
+                                         fbconfig, attributes);
   } else
     return (GLXPbuffer) 0;
 }

Index: glitz_glxext.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glxext.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_glxext.h	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz_glxext.h	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2004 David Reveman, Peter Nilsson
+ * Copyright © 2004 David Reveman, Peter Nilsson
  *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  *
- * Authors: David Reveman <c99drn at cs.umu.se>
+ * Authors: David Reveman <davidr at novell.com>
  *          Peter Nilsson <c99pnn at cs.umu.se>
  */
 

Index: glitz_glxint.h
===================================================================
RCS file: /cvs/cairo/glitz/src/glx/glitz_glxint.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_glxint.h	3 Nov 2004 22:50:58 -0000	1.1
+++ glitz_glxint.h	25 Jan 2005 19:50:26 -0000	1.2
@@ -1,11 +1,11 @@
 /*
- * Copyright © 2004 David Reveman
+ * Copyright © 2004 David Reveman
  * 
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
  * fee, provided that the above copyright notice appear in all copies
  * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the names of
+ * appear in supporting documentation, and that the name of
  * David Reveman not be used in advertising or publicity pertaining to
  * distribution of the software without specific, written prior permission.
  * David Reveman makes no representations about the suitability of this
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <c99drn at cs.umu.se>
+ * Author: David Reveman <davidr at novell.com>
  */
 
 #ifndef GLITZ_GLXINT_H_INCLUDED
@@ -121,7 +121,7 @@
 glitz_glx_query_extensions (glitz_glx_screen_info_t *screen_info,
                             glitz_gl_float_t        glx_version);
 
-extern glitz_glx_screen_info_t *__internal_linkage
+extern glitz_glx_screen_info_t __internal_linkage *
 glitz_glx_screen_info_get (Display *display,
                            int     screen);
 
@@ -129,7 +129,7 @@
 glitz_glx_get_proc_address (const char *name,
                             void       *closure);
 
-extern glitz_glx_context_t *__internal_linkage
+extern glitz_glx_context_t __internal_linkage *
 glitz_glx_context_get (glitz_glx_screen_info_t *screen_info,
                        glitz_drawable_format_t *format);
 
@@ -143,27 +143,25 @@
 extern GLXPbuffer __internal_linkage
 glitz_glx_pbuffer_create (glitz_glx_screen_info_t    *screen_info,
                           GLXFBConfig                fbconfig,
-                          glitz_pbuffer_attributes_t *attributes,
-                          unsigned long              mask,
-                          unsigned int               *width,
-                          unsigned int               *height);
+                          int                        width,
+                          int                        height);
 
 extern void __internal_linkage
 glitz_glx_pbuffer_destroy (glitz_glx_screen_info_t *screen_info,
                            GLXPbuffer              pbuffer);
 
-extern glitz_drawable_t *__internal_linkage
-glitz_glx_create_pbuffer (void                       *abstract_templ,
-                          glitz_drawable_format_t    *format,
-                          glitz_pbuffer_attributes_t *attributes,
-                          unsigned long              mask);
+extern glitz_drawable_t __internal_linkage *
+glitz_glx_create_pbuffer (void                    *abstract_templ,
+                          glitz_drawable_format_t *format,
+                          unsigned int            width,
+                          unsigned int            height);
 
 extern void __internal_linkage
 glitz_glx_push_current (void               *abstract_drawable,
                         glitz_surface_t    *surface,
                         glitz_constraint_t constraint);
 
-extern glitz_surface_t * __internal_linkage
+extern glitz_surface_t __internal_linkage *
 glitz_glx_pop_current (void *abstract_drawable);
 
 extern glitz_status_t __internal_linkage




More information about the cairo-commit mailing list