[cairo-commit] glitz/src/agl glitz-agl.h, 1.1,
1.2 glitz_agl_context.c, 1.1, 1.2 glitz_agl_drawable.c, 1.1,
1.2 glitz_agl_extension.c, 1.1, 1.2 glitz_agl_format.c, 1.1,
1.2 glitz_agl_info.c, 1.1, 1.2 glitz_agl_pbuffer.c, 1.1,
1.2 glitz_aglint.h, 1.1, 1.2
David Reveman
commit at pdx.freedesktop.org
Tue Jan 25 11:50:28 PST 2005
- Previous message: [cairo-commit] glitz AUTHORS, 1.1.1.1, 1.2 COPYING, 1.1.1.1,
1.2 ChangeLog, 1.71, 1.72 README, 1.3, 1.4 TODO, 1.14,
1.15 configure.in, 1.15, 1.16
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: davidr
Update of /cvs/cairo/glitz/src/agl
In directory gabe:/tmp/cvs-serv2384/src/agl
Modified Files:
glitz-agl.h glitz_agl_context.c glitz_agl_drawable.c
glitz_agl_extension.c glitz_agl_format.c glitz_agl_info.c
glitz_agl_pbuffer.c glitz_aglint.h
Log Message:
Add anti-aliased trapezoids, rectangular clipping, multiple geometry arrays, bitmap geometry, mask surface convolution filtering
Index: glitz-agl.h
===================================================================
RCS file: /cvs/cairo/glitz/src/agl/glitz-agl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz-agl.h 3 Nov 2004 22:50:58 -0000 1.1
+++ glitz-agl.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_AGL_H_INCLUDED
@@ -57,13 +57,13 @@
glitz_drawable_t *
glitz_agl_create_drawable_for_window (glitz_drawable_format_t *format,
WindowRef window,
- int width,
- int height);
+ unsigned int width,
+ unsigned int height);
glitz_drawable_t *
-glitz_agl_create_pbuffer_drawable (glitz_drawable_format_t *format,
- glitz_pbuffer_attributes_t *attributes,
- unsigned long mask);
+glitz_agl_create_pbuffer_drawable (glitz_drawable_format_t *format,
+ unsigned int width,
+ unsigned int height);
#if defined(__cplusplus) || defined(c_plusplus)
Index: glitz_agl_context.c
===================================================================
RCS file: /cvs/cairo/glitz/src/agl/glitz_agl_context.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_agl_context.c 3 Nov 2004 22:50:58 -0000 1.1
+++ glitz_agl_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_agl_drawable.c
===================================================================
RCS file: /cvs/cairo/glitz/src/agl/glitz_agl_drawable.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_agl_drawable.c 3 Nov 2004 22:50:58 -0000 1.1
+++ glitz_agl_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
@@ -41,8 +41,8 @@
glitz_drawable_format_t *format,
AGLDrawable agl_drawable,
AGLPbuffer agl_pbuffer,
- int width,
- int height)
+ unsigned int width,
+ unsigned int height)
{
glitz_agl_drawable_t *drawable;
@@ -80,15 +80,14 @@
}
static glitz_drawable_t *
-_glitz_agl_create_pbuffer_drawable (glitz_agl_thread_info_t *thread_info,
- glitz_drawable_format_t *format,
- glitz_pbuffer_attributes_t *attributes,
- unsigned long mask)
+_glitz_agl_create_pbuffer_drawable (glitz_agl_thread_info_t *thread_info,
+ glitz_drawable_format_t *format,
+ unsigned int width,
+ unsigned int height)
{
glitz_agl_drawable_t *drawable;
glitz_agl_context_t *context;
AGLPbuffer pbuffer;
- int width, height;
if (!format->types.pbuffer)
return NULL;
@@ -97,8 +96,7 @@
if (!context)
return NULL;
- pbuffer = glitz_agl_pbuffer_create (thread_info, attributes, mask,
- &width, &height);
+ pbuffer = glitz_agl_pbuffer_create (thread_info, (int) width, (int) height);
if (!pbuffer)
return NULL;
@@ -114,22 +112,22 @@
}
glitz_drawable_t *
-glitz_agl_create_pbuffer (void *abstract_templ,
- glitz_drawable_format_t *format,
- glitz_pbuffer_attributes_t *attributes,
- unsigned long mask)
+glitz_agl_create_pbuffer (void *abstract_templ,
+ glitz_drawable_format_t *format,
+ unsigned int width,
+ unsigned int height)
{
glitz_agl_drawable_t *templ = (glitz_agl_drawable_t *) abstract_templ;
return _glitz_agl_create_pbuffer_drawable (templ->thread_info, format,
- attributes, mask);
+ width, height);
}
glitz_drawable_t *
glitz_agl_create_drawable_for_window (glitz_drawable_format_t *format,
WindowRef window,
- int width,
- int height)
+ unsigned int width,
+ unsigned int height)
{
glitz_agl_drawable_t *drawable;
glitz_agl_thread_info_t *thread_info;
@@ -159,9 +157,9 @@
slim_hidden_def(glitz_agl_create_drawable_for_window);
glitz_drawable_t *
-glitz_agl_create_pbuffer_drawable (glitz_drawable_format_t *format,
- glitz_pbuffer_attributes_t *attributes,
- unsigned long mask)
+glitz_agl_create_pbuffer_drawable (glitz_drawable_format_t *format,
+ unsigned int width,
+ unsigned int height)
{
glitz_agl_thread_info_t *thread_info;
@@ -170,7 +168,7 @@
return NULL;
return _glitz_agl_create_pbuffer_drawable (thread_info, format,
- attributes, mask);
+ width, height);
}
slim_hidden_def(glitz_agl_create_pbuffer_drawable);
Index: glitz_agl_extension.c
===================================================================
RCS file: /cvs/cairo/glitz/src/agl/glitz_agl_extension.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_agl_extension.c 3 Nov 2004 22:50:58 -0000 1.1
+++ glitz_agl_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_agl_format.c
===================================================================
RCS file: /cvs/cairo/glitz/src/agl/glitz_agl_format.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_agl_format.c 3 Nov 2004 22:50:58 -0000 1.1
+++ glitz_agl_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_agl_info.c
===================================================================
RCS file: /cvs/cairo/glitz/src/agl/glitz_agl_info.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_agl_info.c 3 Nov 2004 22:50:58 -0000 1.1
+++ glitz_agl_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
@@ -41,6 +41,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,
@@ -95,6 +96,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_agl_pbuffer.c
===================================================================
RCS file: /cvs/cairo/glitz/src/agl/glitz_agl_pbuffer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_agl_pbuffer.c 3 Nov 2004 22:50:58 -0000 1.1
+++ glitz_agl_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,27 +30,14 @@
#include "glitz_aglint.h"
AGLPbuffer
-glitz_agl_pbuffer_create (glitz_agl_thread_info_t *thread_info,
- glitz_pbuffer_attributes_t *attributes,
- unsigned long mask,
- int *width,
- int *height)
+glitz_agl_pbuffer_create (glitz_agl_thread_info_t *thread_info,
+ int width,
+ int height)
{
AGLPbuffer pbuffer;
glitz_gl_enum_t target;
- int w, h;
-
- if (mask & GLITZ_PBUFFER_WIDTH_MASK)
- w = attributes->width;
- else
- w = GLITZ_DEFAULT_PBUFFER_WIDTH;
-
- if (mask & GLITZ_PBUFFER_HEIGHT_MASK)
- h = attributes->height;
- else
- h = GLITZ_DEFAULT_PBUFFER_HEIGHT;
- if (!POWER_OF_TWO (w) || !POWER_OF_TWO (h)) {
+ if (!POWER_OF_TWO (width) || !POWER_OF_TWO (height)) {
if (thread_info->agl_feature_mask &
GLITZ_AGL_FEATURE_TEXTURE_RECTANGLE_MASK)
target = GLITZ_GL_TEXTURE_RECTANGLE;
@@ -59,10 +46,7 @@
} else
target = GLITZ_GL_TEXTURE_2D;
- aglCreatePBuffer (w, h, target, GLITZ_GL_RGBA, 0, &pbuffer);
-
- *width = w;
- *height = h;
+ aglCreatePBuffer (width, height, target, GLITZ_GL_RGBA, 0, &pbuffer);
return pbuffer;
}
Index: glitz_aglint.h
===================================================================
RCS file: /cvs/cairo/glitz/src/agl/glitz_aglint.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- glitz_aglint.h 3 Nov 2004 22:50:58 -0000 1.1
+++ glitz_aglint.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
@@ -87,10 +87,10 @@
extern glitz_status_t __internal_linkage
glitz_agl_query_extensions (glitz_agl_thread_info_t *thread_info);
-extern glitz_agl_thread_info_t *__internal_linkage
+extern glitz_agl_thread_info_t __internal_linkage *
glitz_agl_thread_info_get (void);
-extern glitz_agl_context_t *__internal_linkage
+extern glitz_agl_context_t __internal_linkage *
glitz_agl_context_get (glitz_agl_thread_info_t *thread_info,
glitz_drawable_format_t *format);
@@ -102,27 +102,25 @@
glitz_agl_query_formats (glitz_agl_thread_info_t *thread_info);
extern AGLPbuffer __internal_linkage
-glitz_agl_pbuffer_create (glitz_agl_thread_info_t *thread_info,
- glitz_pbuffer_attributes_t *attributes,
- unsigned long mask,
- int *width,
- int *height);
+glitz_agl_pbuffer_create (glitz_agl_thread_info_t *thread_info,
+ int width,
+ int height);
extern void __internal_linkage
glitz_agl_pbuffer_destroy (AGLPbuffer pbuffer);
-extern glitz_drawable_t *__internal_linkage
-glitz_agl_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_agl_create_pbuffer (void *abstract_templ,
+ glitz_drawable_format_t *format,
+ unsigned int width,
+ unsigned int height);
extern void __internal_linkage
glitz_agl_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_agl_pop_current (void *abstract_drawable);
extern glitz_status_t __internal_linkage
- Previous message: [cairo-commit] glitz AUTHORS, 1.1.1.1, 1.2 COPYING, 1.1.1.1,
1.2 ChangeLog, 1.71, 1.72 README, 1.3, 1.4 TODO, 1.14,
1.15 configure.in, 1.15, 1.16
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list