ChangeLog |27235 +++++++++--------- Makefile | 2 bin/mklib | 20 configs/darwin | 4 configure.ac | 11 debian/changelog | 9 debian/watch | 3 docs/relnotes-7.6.1.html | 11 docs/relnotes-7.7.html | 10 include/GL/gl_mangle.h | 43 include/GL/glut.h | 668 include/GL/glut_h.dja | 340 include/GL/glutf90.h | 81 include/VG/openvg.h | 686 include/VG/vgext.h | 233 include/VG/vgplatform.h | 106 include/VG/vgu.h | 130 progs/demos/readpix.c | 9 progs/demos/textures.c | 2 progs/egl/.gitignore | 12 progs/egl/eglscreen.c | 119 progs/egl/egltri.c | 263 progs/egl/peglgears.c | 451 progs/egl/xegl_tri.c | 359 progs/egl/xeglbindtex.c | 474 progs/egl/xeglgears.c | 787 progs/egl/xeglthreads.c | 773 progs/fp/add-sat.txt | 6 progs/fp/mov-alias.txt | 6 progs/fp/mul-alias.txt | 6 progs/glsl/shtest.c | 2 progs/glsl/texaaline.c | 6 progs/openvg/demos/Makefile | 39 progs/openvg/demos/eglcommon.c | 288 progs/openvg/demos/eglcommon.h | 20 progs/openvg/demos/lion-render.c | 1573 - progs/openvg/demos/lion-render.h | 16 progs/openvg/demos/lion.c | 288 progs/openvg/demos/sp.c | 537 progs/openvg/trivial/Makefile | 127 progs/openvg/trivial/arc.c | 139 progs/openvg/trivial/cap.c | 75 progs/openvg/trivial/clear.c | 42 progs/openvg/trivial/coord.c | 66 progs/openvg/trivial/dash.c | 95 progs/openvg/trivial/eglcommon.c | 288 progs/openvg/trivial/eglcommon.h | 20 progs/openvg/trivial/ellipse.c | 84 progs/openvg/trivial/filter.c | 107 progs/openvg/trivial/gradorigin.c | 98 progs/openvg/trivial/lineto.c | 56 progs/openvg/trivial/lingrad.c | 87 progs/openvg/trivial/lookup.c | 71 progs/openvg/trivial/mask.c | 58 progs/openvg/trivial/mask4.c | 132 progs/openvg/trivial/path3.c | 77 progs/openvg/trivial/radialgrad.c | 99 progs/openvg/trivial/readpixels.c | 75 progs/openvg/trivial/roundedrect.c | 67 progs/openvg/trivial/star-nonzero.c | 55 progs/openvg/trivial/star-oddeven.c | 102 progs/openvg/trivial/stroke.c | 116 progs/openvg/trivial/stroke2.c | 207 progs/openvg/trivial/vguarc.c | 74 progs/perf/.gitignore | 10 progs/perf/Makefile | 55 progs/perf/SConscript | 32 progs/perf/common.c | 137 progs/perf/common.h | 44 progs/perf/copytex.c | 214 progs/perf/drawoverhead.c | 137 progs/perf/fbobind.c | 153 progs/perf/fill.c | 248 progs/perf/genmipmap.c | 136 progs/perf/glmain.c | 268 progs/perf/glmain.h | 68 progs/perf/readpixels.c | 169 progs/perf/swapbuffers.c | 161 progs/perf/teximage.c | 331 progs/perf/vbo.c | 246 progs/perf/vertexrate.c | 276 progs/rbug/.gitignore | 12 progs/rbug/Makefile | 48 progs/rbug/README | 39 progs/rbug/bin_to_bmp.c | 110 progs/rbug/ctx_info.c | 80 progs/rbug/ctx_rule.c | 86 progs/rbug/shdr_disable.c | 82 progs/rbug/shdr_dump.c | 115 progs/rbug/shdr_info.c | 98 progs/rbug/simple_client.c | 64 progs/rbug/simple_server.c | 62 progs/rbug/tex_dump.c | 127 progs/rbug/tex_info.c | 78 progs/redbook/aaindex.c | 8 progs/redbook/aapoly.c | 8 progs/redbook/aargb.c | 8 progs/redbook/accanti.c | 8 progs/redbook/accpersp.c | 14 progs/redbook/alpha.c | 6 progs/redbook/alpha3D.c | 8 progs/redbook/anti.c | 6 progs/redbook/bezcurve.c | 8 progs/redbook/bezmesh.c | 8 progs/redbook/checker.c | 8 progs/redbook/clip.c | 8 progs/redbook/colormat.c | 10 progs/redbook/cube.c | 8 progs/redbook/depthcue.c | 6 progs/redbook/dof.c | 12 progs/redbook/double.c | 12 progs/redbook/drawf.c | 8 progs/redbook/feedback.c | 14 progs/redbook/fog.c | 10 progs/redbook/fogindex.c | 6 progs/redbook/font.c | 12 progs/redbook/hello.c | 4 progs/redbook/image.c | 12 progs/redbook/light.c | 8 progs/redbook/lines.c | 8 progs/redbook/list.c | 6 progs/redbook/material.c | 6 progs/redbook/mipmap.c | 8 progs/redbook/model.c | 10 progs/redbook/movelight.c | 10 progs/redbook/nurbs.c | 6 progs/redbook/pickdepth.c | 12 progs/redbook/picksquare.c | 14 progs/redbook/plane.c | 8 progs/redbook/planet.c | 8 progs/redbook/polyoff.c | 25 progs/redbook/polys.c | 4 progs/redbook/quadric.c | 10 progs/redbook/robot.c | 8 progs/redbook/sccolorlight.c | 6 progs/redbook/scene.c | 6 progs/redbook/scenebamb.c | 6 progs/redbook/sceneflat.c | 6 progs/redbook/select.c | 18 progs/redbook/smooth.c | 10 progs/redbook/stencil.c | 6 progs/redbook/stroke.c | 8 progs/redbook/surface.c | 14 progs/redbook/teaambient.c | 6 progs/redbook/teapots.c | 8 progs/redbook/tess.c | 18 progs/redbook/tesswind.c | 18 progs/redbook/texbind.c | 10 progs/redbook/texgen.c | 10 progs/redbook/texprox.c | 6 progs/redbook/texsub.c | 10 progs/redbook/texturesurf.c | 8 progs/redbook/torus.c | 6 progs/redbook/trim.c | 12 progs/redbook/unproject.c | 8 progs/redbook/varray.c | 14 progs/redbook/wrap.c | 10 progs/xdemos/corender.c | 2 progs/xdemos/glxinfo.c | 4 src/gallium/state_trackers/xorg/xorg_driver.c | 66 src/gallium/state_trackers/xorg/xorg_exa.c | 31 src/gallium/winsys/drm/intel/gem/intel_drm_api.c | 1 src/gallium/winsys/drm/vmware/core/vmw_screen_ioctl.c | 9 src/gallium/winsys/drm/vmware/core/vmwgfx_drm.h | 78 src/gallium/winsys/drm/vmware/xorg/vmw_driver.h | 11 src/gallium/winsys/drm/vmware/xorg/vmw_ioctl.c | 56 src/gallium/winsys/drm/vmware/xorg/vmw_video.c | 21 src/gallium/winsys/xlib/Makefile | 8 src/glut/beos/Makefile | 99 src/glut/beos/beos_x11.cpp | 180 src/glut/beos/beos_x11.h | 33 src/glut/beos/glutBlocker.cpp | 69 src/glut/beos/glutBlocker.h | 47 src/glut/beos/glutCallback.cpp | 171 src/glut/beos/glutColor.cpp | 32 src/glut/beos/glutCursor.cpp | 90 src/glut/beos/glutCursors.h | 3083 -- src/glut/beos/glutDstr.cpp | 83 src/glut/beos/glutEvent.cpp | 695 src/glut/beos/glutGet.cpp | 211 src/glut/beos/glutInit.cpp | 263 src/glut/beos/glutMenu.cpp | 326 src/glut/beos/glutMenu.h | 84 src/glut/beos/glutOverlay.cpp | 47 src/glut/beos/glutState.h | 71 src/glut/beos/glutWindow.cpp | 633 src/glut/beos/glutWindow.h | 119 src/glut/beos/glut_8x13.c | 2073 - src/glut/beos/glut_9x15.c | 2075 - src/glut/beos/glut_bitmap.c | 57 src/glut/beos/glut_bwidth.c | 58 src/glut/beos/glut_ext.c | 201 src/glut/beos/glut_hel10.c | 1778 - src/glut/beos/glut_hel12.c | 1788 - src/glut/beos/glut_hel18.c | 1897 - src/glut/beos/glut_mroman.c | 2451 - src/glut/beos/glut_roman.c | 2451 - src/glut/beos/glut_shapes.c | 596 src/glut/beos/glut_stroke.c | 42 src/glut/beos/glut_swidth.c | 58 src/glut/beos/glut_teapot.c | 210 src/glut/beos/glut_tr10.c | 1777 - src/glut/beos/glut_tr24.c | 2060 - src/glut/beos/glut_util.c | 81 src/glut/beos/glut_vidresize.c | 230 src/glut/beos/glutbitmap.h | 30 src/glut/beos/glutint.h | 814 src/glut/beos/glutstroke.h | 42 src/glut/directfb/Makefile | 87 src/glut/directfb/NOTES | 9 src/glut/directfb/callback.c | 300 src/glut/directfb/color.c | 39 src/glut/directfb/cursor.c | 175 src/glut/directfb/cursors.h | 306 src/glut/directfb/events.c | 492 src/glut/directfb/ext.c | 202 src/glut/directfb/font.c | 213 src/glut/directfb/font.h | 58 src/glut/directfb/game.c | 153 src/glut/directfb/globals.c | 63 src/glut/directfb/init.c | 128 src/glut/directfb/internal.h | 188 src/glut/directfb/menu.c | 87 src/glut/directfb/models.c | 599 src/glut/directfb/overlay.c | 62 src/glut/directfb/state.c | 219 src/glut/directfb/teapot.c | 212 src/glut/directfb/window.c | 597 src/glut/dos/PC_HW/pc_hw.c | 163 src/glut/dos/PC_HW/pc_hw.h | 229 src/glut/dos/PC_HW/pc_irq.S | 182 src/glut/dos/PC_HW/pc_keyb.c | 540 src/glut/dos/PC_HW/pc_mouse.c | 293 src/glut/dos/PC_HW/pc_timer.c | 327 src/glut/dos/bitmap.c | 115 src/glut/dos/callback.c | 204 src/glut/dos/color.c | 53 src/glut/dos/extens.c | 70 src/glut/dos/f8x13.c | 1183 src/glut/dos/f9x15.c | 1407 src/glut/dos/hel10.c | 1019 src/glut/dos/hel12.c | 1029 src/glut/dos/hel18.c | 1138 src/glut/dos/init.c | 223 src/glut/dos/internal.h | 197 src/glut/dos/loop.c | 245 src/glut/dos/menu.c | 130 src/glut/dos/mouse.c | 55 src/glut/dos/mroman.c | 2779 - src/glut/dos/overlay.c | 93 src/glut/dos/roman.c | 2779 - src/glut/dos/shapes.c | 1143 src/glut/dos/state.c | 238 src/glut/dos/stroke.c | 118 src/glut/dos/teapot.c | 201 src/glut/dos/tr10.c | 1018 src/glut/dos/tr24.c | 1301 src/glut/dos/util.c | 74 src/glut/dos/window.c | 329 src/glut/fbdev/Makefile | 94 src/glut/fbdev/bitmap.c | 78 src/glut/fbdev/callback.c | 171 src/glut/fbdev/colormap.c | 177 src/glut/fbdev/cursor.c | 272 src/glut/fbdev/cursors.h | 7099 ---- src/glut/fbdev/ext.c | 154 src/glut/fbdev/fbdev.c | 940 src/glut/fbdev/gamemode.c | 306 src/glut/fbdev/input.c | 828 src/glut/fbdev/internal.h | 177 src/glut/fbdev/menu.c | 309 src/glut/fbdev/overlay.c | 57 src/glut/fbdev/state.c | 197 src/glut/fbdev/stroke.c | 81 src/glut/fbdev/vidresize.c | 55 src/glut/ggi/Makefile | 53 src/glut/ggi/debug.h | 259 src/glut/ggi/ggiglut.c | 959 src/glut/glx/Makefile | 140 src/glut/glx/Makefile.cygnus | 110 src/glut/glx/Makefile.mgw | 191 src/glut/glx/Makefile.sgi | 189 src/glut/glx/Makefile.win | 99 src/glut/glx/SConscript | 87 src/glut/glx/capturexfont.c | 356 src/glut/glx/fxglut.def | 103 src/glut/glx/glut.def | 125 src/glut/glx/glut.pc.in | 13 src/glut/glx/glut_8x13.c | 2073 - src/glut/glx/glut_9x15.c | 2075 - src/glut/glx/glut_bitmap.c | 57 src/glut/glx/glut_bwidth.c | 58 src/glut/glx/glut_cindex.c | 252 src/glut/glx/glut_cmap.c | 419 src/glut/glx/glut_cursor.c | 201 src/glut/glx/glut_dials.c | 26 src/glut/glx/glut_dstr.c | 1624 - src/glut/glx/glut_event.c | 1389 src/glut/glx/glut_ext.c | 201 src/glut/glx/glut_fcb.c | 164 src/glut/glx/glut_fullscrn.c | 56 src/glut/glx/glut_gamemode.c | 678 src/glut/glx/glut_get.c | 220 src/glut/glx/glut_glxext.c | 255 src/glut/glx/glut_hel10.c | 1778 - src/glut/glx/glut_hel12.c | 1788 - src/glut/glx/glut_hel18.c | 1897 - src/glut/glx/glut_init.c | 394 src/glut/glx/glut_input.c | 644 src/glut/glx/glut_joy.c | 85 src/glut/glx/glut_key.c | 29 src/glut/glx/glut_keyctrl.c | 29 src/glut/glx/glut_keyup.c | 29 src/glut/glx/glut_menu.c | 1018 src/glut/glx/glut_menu2.c | 189 src/glut/glx/glut_mesa.c | 57 src/glut/glx/glut_modifier.c | 31 src/glut/glx/glut_mroman.c | 2451 - src/glut/glx/glut_overlay.c | 607 src/glut/glx/glut_ppm.c | 80 src/glut/glx/glut_roman.c | 2451 - src/glut/glx/glut_shapes.c | 596 src/glut/glx/glut_space.c | 35 src/glut/glx/glut_stroke.c | 42 src/glut/glx/glut_swap.c | 71 src/glut/glx/glut_swidth.c | 58 src/glut/glx/glut_tablet.c | 33 src/glut/glx/glut_teapot.c | 210 src/glut/glx/glut_tr10.c | 1777 - src/glut/glx/glut_tr24.c | 2060 - src/glut/glx/glut_util.c | 86 src/glut/glx/glut_vidresize.c | 231 src/glut/glx/glut_warp.c | 23 src/glut/glx/glut_win.c | 1035 src/glut/glx/glut_winmisc.c | 124 src/glut/glx/glutbitmap.h | 32 src/glut/glx/glutint.h | 798 src/glut/glx/glutstroke.h | 42 src/glut/glx/glutwin32.h | 97 src/glut/glx/layerutil.c | 204 src/glut/glx/layerutil.h | 59 src/glut/glx/stroke.h | 133 src/glut/glx/win32_glx.c | 256 src/glut/glx/win32_glx.h | 58 src/glut/glx/win32_menu.c | 531 src/glut/glx/win32_util.c | 121 src/glut/glx/win32_winproc.c | 792 src/glut/glx/win32_x11.c | 399 src/glut/glx/win32_x11.h | 324 src/glut/mini/Makefile | 103 src/glut/mini/bitmap.c | 56 src/glut/mini/callback.c | 152 src/glut/mini/color.c | 46 src/glut/mini/globals.c | 61 src/glut/mini/glut.pc.in | 13 src/glut/mini/init.c | 59 src/glut/mini/internal.h | 78 src/glut/mini/menu.c | 86 src/glut/mini/models.c | 598 src/glut/mini/overlay.c | 60 src/glut/mini/state.c | 70 src/glut/mini/teapot.c | 212 src/glut/mini/window.c | 273 src/mesa/drivers/common/meta.c | 6 src/mesa/drivers/dri/common/dri_util.c | 2 src/mesa/drivers/dri/i810/i810tris.c | 3 src/mesa/drivers/dri/i915/i915_texstate.c | 18 src/mesa/drivers/dri/i965/brw_cc.c | 4 src/mesa/drivers/dri/i965/brw_vs_emit.c | 14 src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 src/mesa/drivers/dri/intel/intel_buffers.c | 11 src/mesa/drivers/dri/intel/intel_context.c | 2 src/mesa/drivers/dri/mach64/mach64_tris.c | 3 src/mesa/drivers/dri/mga/mgatris.c | 3 src/mesa/drivers/dri/r128/r128_tris.c | 3 src/mesa/drivers/dri/r200/Makefile | 2 src/mesa/drivers/dri/r200/radeon_bo.c | 1 src/mesa/drivers/dri/r200/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r200/radeon_cs.c | 1 src/mesa/drivers/dri/r200/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/r300/Makefile | 2 src/mesa/drivers/dri/r300/r300_texstate.c | 6 src/mesa/drivers/dri/r300/radeon_bo.c | 1 src/mesa/drivers/dri/r300/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r300/radeon_cs.c | 1 src/mesa/drivers/dri/r300/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/r600/Makefile | 2 src/mesa/drivers/dri/r600/r600_cmdbuf.c | 216 src/mesa/drivers/dri/r600/r600_cmdbuf.h | 16 src/mesa/drivers/dri/r600/r700_state.c | 13 src/mesa/drivers/dri/r600/radeon_bo.c | 1 src/mesa/drivers/dri/r600/radeon_bo_int_drm.h | 1 src/mesa/drivers/dri/r600/radeon_cs.c | 1 src/mesa/drivers/dri/r600/radeon_cs_int_drm.h | 1 src/mesa/drivers/dri/radeon/Makefile | 2 src/mesa/drivers/dri/radeon/radeon_bo.c | 110 src/mesa/drivers/dri/radeon/radeon_bo_drm.h | 209 src/mesa/drivers/dri/radeon/radeon_bo_int_drm.h | 45 src/mesa/drivers/dri/radeon/radeon_bo_legacy.c | 83 src/mesa/drivers/dri/radeon/radeon_bocs_wrapper.h | 3 src/mesa/drivers/dri/radeon/radeon_common_context.h | 3 src/mesa/drivers/dri/radeon/radeon_cs.c | 95 src/mesa/drivers/dri/radeon/radeon_cs_drm.h | 215 src/mesa/drivers/dri/radeon/radeon_cs_int_drm.h | 66 src/mesa/drivers/dri/radeon/radeon_cs_legacy.c | 72 src/mesa/drivers/dri/radeon/radeon_cs_space_drm.c | 66 src/mesa/drivers/dri/radeon/radeon_dma.c | 1 src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c | 5 src/mesa/drivers/dri/radeon/radeon_span.c | 3 src/mesa/drivers/dri/radeon/radeon_texture.c | 14 src/mesa/drivers/dri/savage/savageioctl.c | 2 src/mesa/drivers/dri/savage/savagetris.c | 3 src/mesa/drivers/dri/sis/sis_clear.c | 1 src/mesa/drivers/dri/sis/sis_tris.c | 3 src/mesa/drivers/dri/unichrome/via_ioctl.c | 1 src/mesa/drivers/dri/unichrome/via_tris.c | 3 src/mesa/main/compiler.h | 2 src/mesa/main/dlopen.c | 14 src/mesa/main/version.h | 2 src/mesa/shader/prog_print.c | 8 src/mesa/shader/slang/slang_compile.c | 24 src/mesa/shader/slang/slang_compile_operation.c | 1 src/mesa/state_tracker/st_atom_shader.c | 2 src/mesa/state_tracker/st_cb_bufferobjects.c | 16 src/mesa/state_tracker/st_draw.c | 4 src/mesa/state_tracker/st_gen_mipmap.c | 3 src/mesa/state_tracker/st_program.c | 2 src/mesa/swrast/s_atifragshader.c | 2 src/mesa/swrast/s_triangle.c | 6 src/mesa/swrast_setup/ss_tritmp.h | 6 src/mesa/tnl_dd/t_dd_dmatmp.h | 9 src/mesa/tnl_dd/t_dd_dmatmp2.h | 11 src/mesa/tnl_dd/t_dd_tritmp.h | 4 src/mesa/x86/rtasm/x86sse.c | 2 windows/VC7/progs/glut/glut.vcproj | 322 435 files changed, 15402 insertions(+), 128235 deletions(-)
New commits: commit 36461f0d666779654d8d8e19cd7f46eb404213e0 Author: Julien Cristau <[email protected]> Date: Fri Dec 25 19:48:46 2009 +0100 Delete some files not present in tarballs diff --git a/include/GL/glut_h.dja b/include/GL/glut_h.dja deleted file mode 100644 index e76dcb9..0000000 --- a/include/GL/glut_h.dja +++ /dev/null @@ -1,340 +0,0 @@ - -/* - * Mesa 3-D graphics library - * Version: 3.1 - * Copyright (C) 1995-1998 Brian Paul - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - - -/* - * This header file is based on the REAL glut.h by Mark J. Kilgard. - * - * The DJGPP/ALLEGRO (DJA) GLUT implementation was written by - * Bernhard Tschirren ([email protected]) for the sole purpose - * of compiling all the sample programs (which use GLUT). Therefore, - * is NOT AT ALL a complete version of GLUT! - */ - - -#ifndef __AGLUT_H__ -#define __AGLUT_H__ - -#include <GL/gl.h> -#include <GL/glu.h> - -#define GLUTCALLBACK -#define APIENTRY -#define GLUTAPI extern - -#define GLUT_RGB 0 -#define GLUT_RGBA GLUT_RGB -#define GLUT_INDEX 1 -#define GLUT_SINGLE 0 -#define GLUT_DOUBLE 2 -#define GLUT_ACCUM 4 -#define GLUT_ALPHA 8 -#define GLUT_DEPTH 16 -#define GLUT_STENCIL 32 - -/* Mouse buttons. */ -#define GLUT_LEFT_BUTTON 0 -#define GLUT_MIDDLE_BUTTON 1 -#define GLUT_RIGHT_BUTTON 2 - -/* Mouse button state. */ -#define GLUT_DOWN 0 -#define GLUT_UP 1 - -/* function keys */ -#define GLUT_KEY_F1 1 -#define GLUT_KEY_F2 2 -#define GLUT_KEY_F3 3 -#define GLUT_KEY_F4 4 -#define GLUT_KEY_F5 5 -#define GLUT_KEY_F6 6 -#define GLUT_KEY_F7 7 -#define GLUT_KEY_F8 8 -#define GLUT_KEY_F9 9 -#define GLUT_KEY_F10 10 -#define GLUT_KEY_F11 11 -#define GLUT_KEY_F12 12 - -/* directional keys */ -#define GLUT_KEY_LEFT 100 -#define GLUT_KEY_UP 101 -#define GLUT_KEY_RIGHT 102 -#define GLUT_KEY_DOWN 103 -#define GLUT_KEY_PAGE_UP 104 -#define GLUT_KEY_PAGE_DOWN 105 -#define GLUT_KEY_HOME 106 -#define GLUT_KEY_END 107 -#define GLUT_KEY_INSERT 108 - -/* Entry/exit state. */ -#define GLUT_LEFT 0 -#define GLUT_ENTERED 1 - -/* Visibility state. */ -#define GLUT_NOT_VISIBLE 0 -#define GLUT_VISIBLE 1 - -/* Color index component selection values. */ -#define GLUT_RED 0 -#define GLUT_GREEN 1 -#define GLUT_BLUE 2 - -/* Layers for use. */ -#define GLUT_NORMAL 0 -#define GLUT_OVERLAY 1 - -/* Stroke font constants (use these in GLUT program). */ -#define GLUT_STROKE_ROMAN ((void*)0) -#define GLUT_STROKE_MONO_ROMAN ((void*)1) - -/* Bitmap font constants (use these in GLUT program). */ -#define GLUT_BITMAP_9_BY_15 ((void*)2) -#define GLUT_BITMAP_8_BY_13 ((void*)3) -#define GLUT_BITMAP_TIMES_ROMAN_10 ((void*)4) -#define GLUT_BITMAP_TIMES_ROMAN_24 ((void*)5) -#define GLUT_BITMAP_HELVETICA_10 ((void*)6) -#define GLUT_BITMAP_HELVETICA_12 ((void*)7) -#define GLUT_BITMAP_HELVETICA_18 ((void*)8) - -/* glutGet parameters. */ -#define GLUT_WINDOW_X 100 -#define GLUT_WINDOW_Y 101 -#define GLUT_WINDOW_WIDTH 102 -#define GLUT_WINDOW_HEIGHT 103 -#define GLUT_WINDOW_BUFFER_SIZE 104 -#define GLUT_WINDOW_STENCIL_SIZE 105 -#define GLUT_WINDOW_DEPTH_SIZE 106 -#define GLUT_WINDOW_RED_SIZE 107 -#define GLUT_WINDOW_GREEN_SIZE 108 -#define GLUT_WINDOW_BLUE_SIZE 109 -#define GLUT_WINDOW_ALPHA_SIZE 110 -#define GLUT_WINDOW_ACCUM_RED_SIZE 111 -#define GLUT_WINDOW_ACCUM_GREEN_SIZE 112 -#define GLUT_WINDOW_ACCUM_BLUE_SIZE 113 -#define GLUT_WINDOW_ACCUM_ALPHA_SIZE 114 -#define GLUT_WINDOW_DOUBLEBUFFER 115 -#define GLUT_WINDOW_RGBA 116 -#define GLUT_WINDOW_PARENT 117 -#define GLUT_WINDOW_NUM_CHILDREN 118 -#define GLUT_WINDOW_COLORMAP_SIZE 119 -#define GLUT_WINDOW_NUM_SAMPLES 120 -#define GLUT_WINDOW_STEREO 121 -#define GLUT_WINDOW_CURSOR 122 -#define GLUT_SCREEN_WIDTH 200 -#define GLUT_SCREEN_HEIGHT 201 -#define GLUT_SCREEN_WIDTH_MM 202 -#define GLUT_SCREEN_HEIGHT_MM 203 -#define GLUT_MENU_NUM_ITEMS 300 -#define GLUT_DISPLAY_MODE_POSSIBLE 400 -#define GLUT_INIT_WINDOW_X 500 -#define GLUT_INIT_WINDOW_Y 501 -#define GLUT_INIT_WINDOW_WIDTH 502 -#define GLUT_INIT_WINDOW_HEIGHT 503 -#define GLUT_INIT_DISPLAY_MODE 504 -#define GLUT_ELAPSED_TIME 700 -#define GLUT_WINDOW_FORMAT_ID 123 - -/* glutDeviceGet parameters. */ -#define GLUT_HAS_KEYBOARD 600 -#define GLUT_HAS_MOUSE 601 -#define GLUT_HAS_SPACEBALL 602 -#define GLUT_HAS_DIAL_AND_BUTTON_BOX 603 -#define GLUT_HAS_TABLET 604 -#define GLUT_NUM_MOUSE_BUTTONS 605 -#define GLUT_NUM_SPACEBALL_BUTTONS 606 -#define GLUT_NUM_BUTTON_BOX_BUTTONS 607 -#define GLUT_NUM_DIALS 608 -#define GLUT_NUM_TABLET_BUTTONS 609 -#define GLUT_DEVICE_IGNORE_KEY_REPEAT 610 -#define GLUT_DEVICE_KEY_REPEAT 611 -#define GLUT_HAS_JOYSTICK 612 -#define GLUT_OWNS_JOYSTICK 613 -#define GLUT_JOYSTICK_BUTTONS 614 -#define GLUT_JOYSTICK_AXES 615 -#define GLUT_JOYSTICK_POLL_RATE 616 - -/* glutLayerGet parameters. */ -#define GLUT_OVERLAY_POSSIBLE 800 -#define GLUT_LAYER_IN_USE 801 -#define GLUT_HAS_OVERLAY 802 -#define GLUT_TRANSPARENT_INDEX 803 -#define GLUT_NORMAL_DAMAGED 804 -#define GLUT_OVERLAY_DAMAGED 805 - -/* glutVideoResizeGet parameters. */ -#define GLUT_VIDEO_RESIZE_POSSIBLE 900 -#define GLUT_VIDEO_RESIZE_IN_USE 901 -#define GLUT_VIDEO_RESIZE_X_DELTA 902 -#define GLUT_VIDEO_RESIZE_Y_DELTA 903 -#define GLUT_VIDEO_RESIZE_WIDTH_DELTA 904 -#define GLUT_VIDEO_RESIZE_HEIGHT_DELTA 905 -#define GLUT_VIDEO_RESIZE_X 906 -#define GLUT_VIDEO_RESIZE_Y 907 -#define GLUT_VIDEO_RESIZE_WIDTH 908 -#define GLUT_VIDEO_RESIZE_HEIGHT 909 - -/* glutUseLayer parameters. */ -#define GLUT_NORMAL 0 -#define GLUT_OVERLAY 1 - -/* glutGetModifiers return mask. */ -#define GLUT_ACTIVE_SHIFT 1 -#define GLUT_ACTIVE_CTRL 2 -#define GLUT_ACTIVE_ALT 4 - -/* glutSetCursor parameters. */ -/* Basic arrows. */ -#define GLUT_CURSOR_RIGHT_ARROW 0 -#define GLUT_CURSOR_LEFT_ARROW 1 -/* Symbolic cursor shapes. */ -#define GLUT_CURSOR_INFO 2 -#define GLUT_CURSOR_DESTROY 3 -#define GLUT_CURSOR_HELP 4 -#define GLUT_CURSOR_CYCLE 5 -#define GLUT_CURSOR_SPRAY 6 -#define GLUT_CURSOR_WAIT 7 -#define GLUT_CURSOR_TEXT 8 -#define GLUT_CURSOR_CROSSHAIR 9 -/* Directional cursors. */ -#define GLUT_CURSOR_UP_DOWN 10 -#define GLUT_CURSOR_LEFT_RIGHT 11 -/* Sizing cursors. */ -#define GLUT_CURSOR_TOP_SIDE 12 -#define GLUT_CURSOR_BOTTOM_SIDE 13 -#define GLUT_CURSOR_LEFT_SIDE 14 -#define GLUT_CURSOR_RIGHT_SIDE 15 -#define GLUT_CURSOR_TOP_LEFT_CORNER 16 -#define GLUT_CURSOR_TOP_RIGHT_CORNER 17 -#define GLUT_CURSOR_BOTTOM_RIGHT_CORNER 18 -#define GLUT_CURSOR_BOTTOM_LEFT_CORNER 19 -/* Inherit from parent window. */ -#define GLUT_CURSOR_INHERIT 100 -/* Blank cursor. */ -#define GLUT_CURSOR_NONE 101 -/* Fullscreen crosshair (if available). */ -#define GLUT_CURSOR_FULL_CROSSHAIR 102 - -/* GLUT initialization sub-API. */ -GLUTAPI void APIENTRY glutInit(int *argcp, char **argv); -GLUTAPI void APIENTRY glutInitDisplayMode(unsigned int mode); -GLUTAPI void APIENTRY glutInitWindowPosition(int x, int y); -GLUTAPI void APIENTRY glutInitWindowSize(int width, int height); -GLUTAPI void APIENTRY glutMainLoop(void); - -/* GLUT window sub-API. */ -GLUTAPI int APIENTRY glutCreateWindow(const char *title); -GLUTAPI int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height); -GLUTAPI void APIENTRY glutDestroyWindow(int win); -GLUTAPI void APIENTRY glutPostRedisplay(void); -GLUTAPI void APIENTRY glutSwapBuffers(void); -GLUTAPI int APIENTRY glutGetWindow(void); -GLUTAPI void APIENTRY glutSetWindow(int win); -GLUTAPI void APIENTRY glutSetWindowTitle(const char *title); -GLUTAPI void APIENTRY glutSetIconTitle(const char *title); -GLUTAPI void APIENTRY glutPositionWindow(int x, int y); -GLUTAPI void APIENTRY glutReshapeWindow(int width, int height); -GLUTAPI void APIENTRY glutPopWindow(void); -GLUTAPI void APIENTRY glutPushWindow(void); -GLUTAPI void APIENTRY glutIconifyWindow(void); -GLUTAPI void APIENTRY glutShowWindow(void); -GLUTAPI void APIENTRY glutHideWindow(void); - -/* GLUT overlay sub-API. */ -GLUTAPI void APIENTRY glutEstablishOverlay(void); -GLUTAPI void APIENTRY glutRemoveOverlay(void); -GLUTAPI void APIENTRY glutUseLayer(GLenum layer); -GLUTAPI void APIENTRY glutPostOverlayRedisplay(void); -GLUTAPI void APIENTRY glutShowOverlay(void); -GLUTAPI void APIENTRY glutHideOverlay(void); - -/* GLUT menu sub-API. */ -GLUTAPI int APIENTRY glutCreateMenu(void (GLUTCALLBACK *)(int)); -GLUTAPI void APIENTRY glutDestroyMenu(int menu); -GLUTAPI int APIENTRY glutGetMenu(void); -GLUTAPI void APIENTRY glutSetMenu(int menu); -GLUTAPI void APIENTRY glutAddMenuEntry(const char *label, int value); -GLUTAPI void APIENTRY glutAddSubMenu(const char *label, int submenu); -GLUTAPI void APIENTRY glutChangeToMenuEntry(int item, const char *label, int value); -GLUTAPI void APIENTRY glutChangeToSubMenu(int item, const char *label, int submenu); -GLUTAPI void APIENTRY glutRemoveMenuItem(int item); -GLUTAPI void APIENTRY glutAttachMenu(int button); -GLUTAPI void APIENTRY glutDetachMenu(int button); - -/* GLUT window callback sub-API. */ -GLUTAPI void APIENTRY glutDisplayFunc(void (GLUTCALLBACK * func)(void)); -GLUTAPI void APIENTRY glutReshapeFunc(void (GLUTCALLBACK * func)(int width, int height)); -GLUTAPI void APIENTRY glutKeyboardFunc(void (GLUTCALLBACK * func)(unsigned char key, int x, int y)); -GLUTAPI void APIENTRY glutMouseFunc(void (GLUTCALLBACK * func)(int button, int state, int x, int y)); -GLUTAPI void APIENTRY glutMotionFunc(void (GLUTCALLBACK * func)(int x, int y)); -GLUTAPI void APIENTRY glutPassiveMotionFunc(void (GLUTCALLBACK * func)(int x, int y)); -GLUTAPI void APIENTRY glutEntryFunc(void (GLUTCALLBACK * func)(int state)); -GLUTAPI void APIENTRY glutVisibilityFunc(void (GLUTCALLBACK * func)(int state)); -GLUTAPI void APIENTRY glutIdleFunc(void (GLUTCALLBACK * func)(void)); -GLUTAPI void APIENTRY glutTimerFunc(unsigned int millis, void (GLUTCALLBACK * func)(int value), int value); -GLUTAPI void APIENTRY glutMenuStateFunc(void (GLUTCALLBACK * func)(int state)); -GLUTAPI void APIENTRY glutSpecialFunc(void (GLUTCALLBACK * func)(int key, int x, int y)); -GLUTAPI void APIENTRY glutSpaceballMotionFunc(void (GLUTCALLBACK * func)(int x, int y, int z)); -GLUTAPI void APIENTRY glutSpaceballRotateFunc(void (GLUTCALLBACK * func)(int x, int y, int z)); -GLUTAPI void APIENTRY glutSpaceballButtonFunc(void (GLUTCALLBACK * func)(int button, int state)); -GLUTAPI void APIENTRY glutButtonBoxFunc(void (GLUTCALLBACK * func)(int button, int state)); -GLUTAPI void APIENTRY glutDialsFunc(void (GLUTCALLBACK * func)(int dial, int value)); -GLUTAPI void APIENTRY glutTabletMotionFunc(void (GLUTCALLBACK * func)(int x, int y)); -GLUTAPI void APIENTRY glutTabletButtonFunc(void (GLUTCALLBACK * func)(int button, int state, int x, int y)); -GLUTAPI void APIENTRY glutMenuStatusFunc(void (GLUTCALLBACK * func)(int status, int x, int y)); -GLUTAPI void APIENTRY glutOverlayDisplayFunc(void (GLUTCALLBACK * func)(void)); -GLUTAPI void APIENTRY glutWindowStatusFunc(void (GLUTCALLBACK * func)(int state)); - -/* GLUT color index sub-API. */ -GLUTAPI void APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue); -GLUTAPI GLfloat APIENTRY glutGetColor(int ndx, int component); -GLUTAPI void APIENTRY glutCopyColormap(int win); - -/* GLUT state retrieval sub-API. */ -GLUTAPI int APIENTRY glutGet(GLenum type); -GLUTAPI int APIENTRY glutDeviceGet(GLenum type); - -/* GLUT font sub-API */ -GLUTAPI void APIENTRY glutBitmapCharacter(void *font, int character); -GLUTAPI int APIENTRY glutBitmapWidth(void *font, int character); -GLUTAPI void APIENTRY glutStrokeCharacter(void *font, int character); -GLUTAPI int APIENTRY glutStrokeWidth(void *font, int character); - -/* GLUT pre-built models sub-API */ -GLUTAPI void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutWireCube(GLdouble size); -GLUTAPI void APIENTRY glutSolidCube(GLdouble size); -GLUTAPI void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); -GLUTAPI void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); -GLUTAPI void APIENTRY glutWireDodecahedron(void); -GLUTAPI void APIENTRY glutSolidDodecahedron(void); -GLUTAPI void APIENTRY glutWireTeapot(GLdouble size); -GLUTAPI void APIENTRY glutSolidTeapot(GLdouble size); -GLUTAPI void APIENTRY glutWireOctahedron(void); -GLUTAPI void APIENTRY glutSolidOctahedron(void); -GLUTAPI void APIENTRY glutWireTetrahedron(void); -GLUTAPI void APIENTRY glutSolidTetrahedron(void); -GLUTAPI void APIENTRY glutWireIcosahedron(void); -GLUTAPI void APIENTRY glutSolidIcosahedron(void); - -#endif /* __AGLUT_H__ */ diff --git a/include/VG/openvg.h b/include/VG/openvg.h deleted file mode 100644 index 60167e4..0000000 --- a/include/VG/openvg.h +++ /dev/null @@ -1,686 +0,0 @@ -/* $Revision: 6822 $ on $Date:: 2008-10-30 05:14:19 -0400 #$ */ - -/*------------------------------------------------------------------------ - * - * OpenVG 1.0.1 Reference Implementation - * ------------------------------------- - * - * Copyright (c) 2008 The Khronos Group Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and /or associated documentation files - * (the "Materials "), to deal in the Materials without restriction, - * including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Materials, - * and to permit persons to whom the Materials are furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Materials. - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE MATERIALS OR - * THE USE OR OTHER DEALINGS IN THE MATERIALS. - * - *//** - * \file - * \brief OpenVG 1.0.1 API. - *//*-------------------------------------------------------------------*/ - -#ifndef _OPENVG_H -#define _OPENVG_H - -#include <VG/vgplatform.h> - -#ifdef __cplusplus -extern "C" { -#endif - -#define OPENVG_VERSION_1_0 1 -#define OPENVG_VERSION_1_0_1 1 - -#ifndef VG_MAXSHORT -#define VG_MAXSHORT 0x7FFF -#endif - -#ifndef VG_MAXINT -#define VG_MAXINT 0x7FFFFFFF -#endif - -#ifndef VG_MAX_ENUM -#define VG_MAX_ENUM 0x7FFFFFFF -#endif - -typedef long VGHandle; - -typedef VGHandle VGPath; -typedef VGHandle VGImage; -typedef VGHandle VGPaint; - -#define VG_INVALID_HANDLE ((VGHandle)0) - -typedef enum { - VG_FALSE = 0, - VG_TRUE = 1, - - VG_BOOLEAN_FORCE_SIZE = VG_MAX_ENUM -} VGboolean; - -typedef enum { - VG_NO_ERROR = 0, - VG_BAD_HANDLE_ERROR = 0x1000, - VG_ILLEGAL_ARGUMENT_ERROR = 0x1001, - VG_OUT_OF_MEMORY_ERROR = 0x1002, - VG_PATH_CAPABILITY_ERROR = 0x1003, - VG_UNSUPPORTED_IMAGE_FORMAT_ERROR = 0x1004, - VG_UNSUPPORTED_PATH_FORMAT_ERROR = 0x1005, - VG_IMAGE_IN_USE_ERROR = 0x1006, - VG_NO_CONTEXT_ERROR = 0x1007, - - VG_ERROR_CODE_FORCE_SIZE = VG_MAX_ENUM -} VGErrorCode; - -typedef enum { - /* Mode settings */ - VG_MATRIX_MODE = 0x1100, - VG_FILL_RULE = 0x1101, - VG_IMAGE_QUALITY = 0x1102, - VG_RENDERING_QUALITY = 0x1103, - VG_BLEND_MODE = 0x1104, - VG_IMAGE_MODE = 0x1105, - - /* Scissoring rectangles */ - VG_SCISSOR_RECTS = 0x1106, - - /* Stroke parameters */ - VG_STROKE_LINE_WIDTH = 0x1110, - VG_STROKE_CAP_STYLE = 0x1111, - VG_STROKE_JOIN_STYLE = 0x1112, - VG_STROKE_MITER_LIMIT = 0x1113, - VG_STROKE_DASH_PATTERN = 0x1114, - VG_STROKE_DASH_PHASE = 0x1115, - VG_STROKE_DASH_PHASE_RESET = 0x1116, - - /* Edge fill color for VG_TILE_FILL tiling mode */ - VG_TILE_FILL_COLOR = 0x1120, - - /* Color for vgClear */ - VG_CLEAR_COLOR = 0x1121, - - /* Enable/disable alpha masking and scissoring */ - VG_MASKING = 0x1130, - VG_SCISSORING = 0x1131, - - /* Pixel layout information */ - VG_PIXEL_LAYOUT = 0x1140, - VG_SCREEN_LAYOUT = 0x1141, - - /* Source format selection for image filters */ - VG_FILTER_FORMAT_LINEAR = 0x1150, - VG_FILTER_FORMAT_PREMULTIPLIED = 0x1151, - - /* Destination write enable mask for image filters */ - VG_FILTER_CHANNEL_MASK = 0x1152, - - /* Implementation limits (read-only) */ - VG_MAX_SCISSOR_RECTS = 0x1160, - VG_MAX_DASH_COUNT = 0x1161, - VG_MAX_KERNEL_SIZE = 0x1162, - VG_MAX_SEPARABLE_KERNEL_SIZE = 0x1163, - VG_MAX_COLOR_RAMP_STOPS = 0x1164, - VG_MAX_IMAGE_WIDTH = 0x1165, - VG_MAX_IMAGE_HEIGHT = 0x1166, - VG_MAX_IMAGE_PIXELS = 0x1167, - VG_MAX_IMAGE_BYTES = 0x1168, - VG_MAX_FLOAT = 0x1169, - VG_MAX_GAUSSIAN_STD_DEVIATION = 0x116A, - - VG_PARAM_TYPE_FORCE_SIZE = VG_MAX_ENUM -} VGParamType; - -typedef enum { - VG_RENDERING_QUALITY_NONANTIALIASED = 0x1200, - VG_RENDERING_QUALITY_FASTER = 0x1201, - VG_RENDERING_QUALITY_BETTER = 0x1202, /* Default */ - - VG_RENDERING_QUALITY_FORCE_SIZE = VG_MAX_ENUM -} VGRenderingQuality; - -typedef enum { - VG_PIXEL_LAYOUT_UNKNOWN = 0x1300, - VG_PIXEL_LAYOUT_RGB_VERTICAL = 0x1301, - VG_PIXEL_LAYOUT_BGR_VERTICAL = 0x1302, - VG_PIXEL_LAYOUT_RGB_HORIZONTAL = 0x1303, - VG_PIXEL_LAYOUT_BGR_HORIZONTAL = 0x1304, - - VG_PIXEL_LAYOUT_FORCE_SIZE = VG_MAX_ENUM -} VGPixelLayout; - -typedef enum { - VG_MATRIX_PATH_USER_TO_SURFACE = 0x1400, - VG_MATRIX_IMAGE_USER_TO_SURFACE = 0x1401, - VG_MATRIX_FILL_PAINT_TO_USER = 0x1402, - VG_MATRIX_STROKE_PAINT_TO_USER = 0x1403, - - VG_MATRIX_MODE_FORCE_SIZE = VG_MAX_ENUM -} VGMatrixMode; - -typedef enum { - VG_CLEAR_MASK = 0x1500, - VG_FILL_MASK = 0x1501, - VG_SET_MASK = 0x1502, - VG_UNION_MASK = 0x1503, - VG_INTERSECT_MASK = 0x1504, - VG_SUBTRACT_MASK = 0x1505, - - VG_MASK_OPERATION_FORCE_SIZE = VG_MAX_ENUM -} VGMaskOperation; - -#define VG_PATH_FORMAT_STANDARD 0 - -typedef enum { - VG_PATH_DATATYPE_S_8 = 0, - VG_PATH_DATATYPE_S_16 = 1, - VG_PATH_DATATYPE_S_32 = 2, - VG_PATH_DATATYPE_F = 3, - - VG_PATH_DATATYPE_FORCE_SIZE = VG_MAX_ENUM -} VGPathDatatype; - -typedef enum { - VG_ABSOLUTE = 0, - VG_RELATIVE = 1, - - VG_PATH_ABS_REL_FORCE_SIZE = VG_MAX_ENUM -} VGPathAbsRel; - -typedef enum { - VG_CLOSE_PATH = ( 0 << 1), - VG_MOVE_TO = ( 1 << 1), - VG_LINE_TO = ( 2 << 1), -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
