Makefile | 17
configs/autoconf.in | 18
configs/default | 17
configure.ac | 44
docs/cell.html | 72
docs/contents.html | 4
docs/download.html | 4
docs/install.html | 67
docs/news.html | 14
docs/relnotes-7.2.html | 104
docs/relnotes-7.3.html | 79
docs/relnotes.html | 2
docs/shading.html | 70
include/GL/Makefile.am | 11
include/GL/amesa.h | 65
include/GL/fxmesa.h | 103
include/GL/glext.h | 68
include/GL/glxext.h | 32
include/GL/internal/dri_interface.h | 4
include/GL/uglglutshapes.h | 45
include/GL/uglmesa.h | 155
include/GL/xmesa.h | 424 --
include/GL/xmesa_x.h | 86
include/GL/xmesa_xf86.h | 198 -
include/GLView.h | 192 -
progs/demos/arbocclude.c | 5
progs/glsl/.gitignore | 1
progs/glsl/Makefile | 18
progs/glsl/multinoise.c | 281 +
progs/glsl/noise.c | 1
progs/glsl/samplers.c | 357 ++
progs/glsl/twoside.c | 44
progs/glsl/vert-or-frag-only.c | 191 +
progs/tests/Makefile | 22
progs/tests/floattex.c | 160
progs/util/shaderutil.c | 9
src/glu/Makefile | 6
src/glu/glu.pc.in | 6
src/glu/sgi/glu.exports | 59
src/glut/glx/Makefile | 6
src/glut/glx/glut.pc.in | 4
src/glut/glx/glut_init.c | 4
src/glut/glx/glut_ppm.c | 80
src/glut/glx/glut_swap.c | 4
src/glut/glx/glutint.h | 5
src/glut/mini/Makefile | 5
src/glut/mini/glut.pc.in | 4
src/glw/Makefile | 5
src/glw/glw.pc.in | 4
src/glx/x11/indirect.c | 10
src/mesa/Makefile | 25
src/mesa/drivers/allegro/amesa.c | 2
src/mesa/drivers/allegro/amesa.h | 65
src/mesa/drivers/dri/Makefile | 3
src/mesa/drivers/dri/common/dri_util.c | 19
src/mesa/drivers/dri/common/vblank.c | 18
src/mesa/drivers/dri/dri.pc.in | 1
src/mesa/drivers/dri/i915/i830_vtbl.c | 15
src/mesa/drivers/dri/i915/i915_context.c | 2
src/mesa/drivers/dri/i915/i915_fragprog.c | 22
src/mesa/drivers/dri/i915/i915_state.c | 2
src/mesa/drivers/dri/i915/i915_texstate.c | 7
src/mesa/drivers/dri/i915/i915_vtbl.c | 13
src/mesa/drivers/dri/i965/Makefile | 1
src/mesa/drivers/dri/i965/brw_context.c | 6
src/mesa/drivers/dri/i965/brw_context.h | 2
src/mesa/drivers/dri/i965/brw_draw.c | 4
src/mesa/drivers/dri/i965/brw_eu.h | 89
src/mesa/drivers/dri/i965/brw_eu_emit.c | 1
src/mesa/drivers/dri/i965/brw_state.h | 1
src/mesa/drivers/dri/i965/brw_state_upload.c | 4
src/mesa/drivers/dri/i965/brw_vs_emit.c | 120
src/mesa/drivers/dri/i965/brw_vs_tnl.c | 59
src/mesa/drivers/dri/i965/brw_wm.c | 3
src/mesa/drivers/dri/i965/brw_wm_emit.c | 81
src/mesa/drivers/dri/i965/brw_wm_fp.c | 14
src/mesa/drivers/dri/i965/brw_wm_glsl.c | 455 ++
src/mesa/drivers/dri/intel/intel_batchbuffer.h | 22
src/mesa/drivers/dri/intel/intel_buffers.c | 2
src/mesa/drivers/dri/intel/intel_context.c | 11
src/mesa/drivers/dri/intel/intel_context.h | 14
src/mesa/drivers/dri/intel/intel_decode.c | 146
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 6
src/mesa/drivers/dri/intel/intel_pixel.c | 168
src/mesa/drivers/dri/intel/intel_pixel.h | 9
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 268 +
src/mesa/drivers/dri/intel/intel_pixel_copy.c | 7
src/mesa/drivers/dri/intel/intel_pixel_draw.c | 61
src/mesa/drivers/dri/intel/intel_regions.c | 9
src/mesa/drivers/dri/intel/intel_screen.c | 15
src/mesa/drivers/dri/intel/intel_screen.h | 1
src/mesa/drivers/dri/intel/intel_tex.c | 1
src/mesa/drivers/dri/intel/intel_tex.h | 10
src/mesa/drivers/dri/intel/intel_tex_copy.c | 109
src/mesa/drivers/dri/intel/intel_tex_subimage.c | 15
src/mesa/drivers/dri/r300/r300_reg.h | 8
src/mesa/drivers/dri/r300/r300_render.c | 3
src/mesa/drivers/dri/swrast/swrast.c | 2
src/mesa/drivers/osmesa/Makefile | 7
src/mesa/drivers/x11/fakeglx.c | 1
src/mesa/drivers/x11/fxmesa.h | 103
src/mesa/drivers/x11/xm_api.c | 1
src/mesa/drivers/x11/xm_buffer.c | 1
src/mesa/drivers/x11/xmesa.h | 424 ++
src/mesa/drivers/x11/xmesaP.h | 4
src/mesa/drivers/x11/xmesa_x.h | 86
src/mesa/drivers/x11/xmesa_xf86.h | 198 +
src/mesa/gl.pc.in | 5
src/mesa/glapi/extension_helper.py | 3
src/mesa/glapi/glX_proto_recv.py | 4
src/mesa/glapi/glX_proto_send.py | 14
src/mesa/glapi/glX_proto_size.py | 5
src/mesa/glapi/gl_API.dtd | 1
src/mesa/glapi/gl_API.xml | 15
src/mesa/glapi/gl_XML.py | 4
src/mesa/glapi/gl_apitemp.py | 3
src/mesa/glapi/gl_x86_asm.py | 3
src/mesa/main/arrayobj.c | 6
src/mesa/main/attrib.c | 5
src/mesa/main/bufferobj.c | 2
src/mesa/main/config.h | 57
src/mesa/main/context.c | 21
src/mesa/main/dlopen.c | 99
src/mesa/main/dlopen.h | 42
src/mesa/main/enable.c | 148
src/mesa/main/ffvertex_prog.c | 48
src/mesa/main/get.c | 6
src/mesa/main/get_gen.py | 2
src/mesa/main/image.c | 8
src/mesa/main/image.h | 3
src/mesa/main/imports.c | 12
src/mesa/main/imports.h | 3
src/mesa/main/mipmap.c | 473 ++
src/mesa/main/mtypes.h | 59
src/mesa/main/points.c | 2
src/mesa/main/rastpos.c | 2
src/mesa/main/sources | 2
src/mesa/main/state.c | 17
src/mesa/main/texcompress_s3tc.c | 75
src/mesa/main/texenvprogram.c | 23
src/mesa/main/texformat.c | 2
src/mesa/main/texobj.c | 12
src/mesa/main/texrender.c | 52
src/mesa/main/texstate.c | 11
src/mesa/main/version.h | 2
src/mesa/osmesa.pc.in | 12
src/mesa/shader/prog_execute.c | 24
src/mesa/shader/prog_noise.c | 638 +++
src/mesa/shader/prog_noise.h | 34
src/mesa/shader/prog_parameter.c | 4
src/mesa/shader/prog_print.c | 2
src/mesa/shader/prog_statevars.h | 8
src/mesa/shader/program.c | 2
src/mesa/shader/slang/library/slang_120_core_gc.h | 1389 ++++----
src/mesa/shader/slang/library/slang_builtin_120_common_gc.h | 195 -
src/mesa/shader/slang/library/slang_builtin_120_fragment_gc.h | 2
src/mesa/shader/slang/library/slang_common_builtin.gc | 17
src/mesa/shader/slang/library/slang_common_builtin_gc.h | 1698 ++++-----
src/mesa/shader/slang/library/slang_core.gc | 569 +--
src/mesa/shader/slang/library/slang_core_gc.h | 1708 ++++------
src/mesa/shader/slang/library/slang_fragment_builtin_gc.h | 203 -
src/mesa/shader/slang/library/slang_shader.syn | 130
src/mesa/shader/slang/library/slang_shader_syn.h | 43
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h | 174 -
src/mesa/shader/slang/slang_builtin.c | 299 +
src/mesa/shader/slang/slang_builtin.h | 3
src/mesa/shader/slang/slang_codegen.c | 1108 ++++--
src/mesa/shader/slang/slang_codegen.h | 13
src/mesa/shader/slang/slang_compile.c | 356 +-
src/mesa/shader/slang/slang_compile.h | 14
src/mesa/shader/slang/slang_compile_function.c | 124
src/mesa/shader/slang/slang_compile_function.h | 35
src/mesa/shader/slang/slang_compile_operation.c | 3
src/mesa/shader/slang/slang_compile_operation.h | 6
src/mesa/shader/slang/slang_compile_variable.c | 106
src/mesa/shader/slang/slang_compile_variable.h | 76
src/mesa/shader/slang/slang_emit.c | 98
src/mesa/shader/slang/slang_emit.h | 4
src/mesa/shader/slang/slang_library_noise.c | 501 --
src/mesa/shader/slang/slang_library_noise.h | 42
src/mesa/shader/slang/slang_link.c | 102
src/mesa/shader/slang/slang_log.c | 15
src/mesa/shader/slang/slang_preprocess.c | 97
src/mesa/shader/slang/slang_preprocess.h | 6
src/mesa/shader/slang/slang_print.c | 4
src/mesa/shader/slang/slang_simplify.c | 6
src/mesa/shader/slang/slang_storage.h | 1
src/mesa/shader/slang/slang_typeinfo.c | 249 -
src/mesa/shader/slang/slang_typeinfo.h | 125
src/mesa/sources | 3
src/mesa/swrast/s_aalinetemp.h | 2
src/mesa/tnl/t_context.c | 2
src/mesa/tnl/t_vertex_generic.c | 2
src/mesa/tnl/t_vertex_sse.c | 12
windows/VC7/mesa/mesa/mesa.vcproj | 12
windows/VC8/mesa/mesa/mesa.vcproj | 16
196 files changed, 10751 insertions(+), 6726 deletions(-)
New commits:
commit f1455ca5f411ee8f7d992682e3e9c55d82e75715
Author: Brian Paul <bri...@vmware.com>
Date: Sat Jan 10 12:21:37 2009 -0700
mesa: omit old headers from tarball
diff --git a/Makefile b/Makefile
index dbe444d..5a47375 100644
--- a/Makefile
+++ b/Makefile
@@ -200,9 +200,7 @@ MAIN_FILES = \
$(DIRECTORY)/docs/RELNOTES* \
$(DIRECTORY)/docs/*.spec \
$(DIRECTORY)/include/GL/internal/glcore.h \
- $(DIRECTORY)/include/GL/amesa.h \
$(DIRECTORY)/include/GL/dmesa.h \
- $(DIRECTORY)/include/GL/fxmesa.h \
$(DIRECTORY)/include/GL/ggimesa.h \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/glext.h \
@@ -217,13 +215,8 @@ MAIN_FILES = \
$(DIRECTORY)/include/GL/mglmesa.h \
$(DIRECTORY)/include/GL/osmesa.h \
$(DIRECTORY)/include/GL/svgamesa.h \
- $(DIRECTORY)/include/GL/ugl*.h \
$(DIRECTORY)/include/GL/vms_x_fix.h \
$(DIRECTORY)/include/GL/wmesa.h \
- $(DIRECTORY)/include/GL/xmesa.h \
- $(DIRECTORY)/include/GL/xmesa_x.h \
- $(DIRECTORY)/include/GL/xmesa_xf86.h \
- $(DIRECTORY)/include/GLView.h \
$(DIRECTORY)/src/Makefile \
$(DIRECTORY)/src/descrip.mms \
$(DIRECTORY)/src/mesa/Makefile* \
commit 834db8215362ca859ad4ef18441936238d1b6670
Author: Brian Paul <bri...@vmware.com>
Date: Sat Jan 10 12:09:08 2009 -0700
docs: document deprecated/removed headers/interfaces
diff --git a/docs/relnotes-7.3.html b/docs/relnotes-7.3.html
index c00e5fe..c486614 100644
--- a/docs/relnotes-7.3.html
+++ b/docs/relnotes-7.3.html
@@ -47,6 +47,11 @@ tbd
<h2>Changes</h2>
<ul>
+<li>Deprecated the "XMesa" interface (include/GL/xmesa*.h files)
+<li>Deprecated the "FXMesa" interface (include/GL/fxmesa.h file)
+<li>Deprecated the "Allegro" interface (include/GL/amesa.h file)
+<li>Removed include/GL/uglmesa.h header
+<li>Removed include/GLView.h header for BeOS
</ul>
commit ef193c10e7b3f048abf5fce0d7dc4d72d94ba123
Author: Brian Paul <bri...@vmware.com>
Date: Sat Jan 10 12:07:58 2009 -0700
mesa: remove old GLView.h header for BeOS
diff --git a/include/GLView.h b/include/GLView.h
deleted file mode 100644
index 8d9d25b..0000000
--- a/include/GLView.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
-/
-/ File: GLView.h
-/
-/ Copyright 1993-98, Be Incorporated, All Rights Reserved.
-/
-*******************************************************************************/
-
-#ifndef BGLVIEW_H
-#define BGLVIEW_H
-
-#include <GL/gl.h>
-
-#define BGL_RGB 0
-#define BGL_INDEX 1
-#define BGL_SINGLE 0
-#define BGL_DOUBLE 2
-#define BGL_DIRECT 0
-#define BGL_INDIRECT 4
-#define BGL_ACCUM 8
-#define BGL_ALPHA 16
-#define BGL_DEPTH 32
-#define BGL_OVERLAY 64
-#define BGL_UNDERLAY 128
-#define BGL_STENCIL 512
-
-#ifdef __cplusplus
-
-
-#include <AppKit.h>
-#include <interface/Window.h>
-#include <interface/View.h>
-#include <interface/Bitmap.h>
-#include <game/WindowScreen.h>
-#include <game/DirectWindow.h>
-
-class BGLView : public BView {
-public:
-
- BGLView(BRect rect, char *name,
- ulong resizingMode, ulong mode,
- ulong options);
-virtual ~BGLView();
-
- void LockGL();
- void UnlockGL();
- void SwapBuffers();
- void SwapBuffers( bool vSync );
- BView * EmbeddedView();
- status_t CopyPixelsOut(BPoint source, BBitmap *dest);
- status_t CopyPixelsIn(BBitmap *source, BPoint dest);
-virtual void ErrorCallback(unsigned long errorCode); //
Mesa's GLenum is uint where Be's ones was ulong!
-
-virtual void Draw(BRect updateRect);
-
-virtual void AttachedToWindow();
-virtual void AllAttached();
-virtual void DetachedFromWindow();
-virtual void AllDetached();
-
-virtual void FrameResized(float width, float height);
-virtual status_t Perform(perform_code d, void *arg);
-
- /* The public methods below, for the moment,
- are just pass-throughs to BView */
-
-virtual status_t Archive(BMessage *data, bool deep = true) const;
-
-virtual void MessageReceived(BMessage *msg);
-virtual void SetResizingMode(uint32 mode);
-
-virtual void Show();
-virtual void Hide();
-
-virtual BHandler *ResolveSpecifier(BMessage *msg, int32 index,
- BMessage *specifier,
int32 form,
- const char *property);
-virtual status_t GetSupportedSuites(BMessage *data);
-
-/* New public functions */
- void DirectConnected( direct_buffer_info *info );
- void EnableDirectMode( bool enabled );
-
- void * getGC() { return m_gc; }
-
-private:
-
-virtual void _ReservedGLView1();
-virtual void _ReservedGLView2();
-virtual void _ReservedGLView3();
-virtual void _ReservedGLView4();
-virtual void _ReservedGLView5();
-virtual void _ReservedGLView6();
-virtual void _ReservedGLView7();
-virtual void _ReservedGLView8();
-
- BGLView(const BGLView &);
- BGLView &operator=(const BGLView &);
-
- void dither_front();
- bool confirm_dither();
- void draw(BRect r);
-
- void * m_gc;
- uint32 m_options;
- uint32 m_ditherCount;
- BLocker m_drawLock;
- BLocker m_displayLock;
- void * m_clip_info;
- void * _Unused1;
-
- BBitmap * m_ditherMap;
- BRect m_bounds;
- int16 * m_errorBuffer[2];
- uint64 _reserved[8];
-
- /* Direct Window stuff */
-private:
- void drawScanline( int x1, int x2, int y, void *data
);
-static void scanlineHandler(struct rasStateRec *state,
GLint x1, GLint x2);
-
- void lock_draw();
- void unlock_draw();
- bool validateView();
-};
-
-
-
-class BGLScreen : public BWindowScreen {
-public:
- BGLScreen(char *name,
- ulong screenMode, ulong options,
- status_t *error, bool debug=false);
- ~BGLScreen();
-
- void LockGL();
- void UnlockGL();
- void SwapBuffers();
- virtual void ErrorCallback(GLenum errorCode);
-
- virtual void ScreenConnected(bool connected);
- virtual void FrameResized(float width, float height);
- virtual status_t Perform(perform_code d, void *arg);
-
- /* The public methods below, for the moment,
- are just pass-throughs to BWindowScreen */
-
- virtual status_t Archive(BMessage *data, bool deep = true) const;
- virtual void MessageReceived(BMessage *msg);
-
- virtual void Show();
- virtual void Hide();
-
- virtual BHandler *ResolveSpecifier(BMessage *msg,
- int32 index,
- BMessage *specifier,
- int32 form,
- const char *property);
- virtual status_t GetSupportedSuites(BMessage *data);
-
-private:
-
- virtual void _ReservedGLScreen1();
- virtual void _ReservedGLScreen2();
- virtual void _ReservedGLScreen3();
- virtual void _ReservedGLScreen4();
- virtual void _ReservedGLScreen5();
- virtual void _ReservedGLScreen6();
- virtual void _ReservedGLScreen7();
- virtual void _ReservedGLScreen8();
-
- BGLScreen(const BGLScreen &);
- BGLScreen &operator=(const BGLScreen &);
-
- void * m_gc;
- long m_options;
- BLocker m_drawLock;
-
- int32 m_colorSpace;
- uint32 m_screen_mode;
-
- uint64 _reserved[7];
-};
-
-#endif // __cplusplus
-
-#endif // BGLVIEW_H
-
-
-
-
-
commit c3a00a728b15a13a33a38c8687ed6732c98d2260
Author: Brian Paul <bri...@vmware.com>
Date: Sat Jan 10 12:06:29 2009 -0700
mesa: remove deprecated headers from Makefile.am
diff --git a/include/GL/Makefile.am b/include/GL/Makefile.am
index 199bd5c..ca528f6 100644
--- a/include/GL/Makefile.am
+++ b/include/GL/Makefile.am
@@ -2,17 +2,12 @@
GLincludedir = $(includedir)/GL
-INC_FX = fxmesa.h
INC_GGI = ggimesa.h
INC_OSMESA = osmesa.h
INC_SVGA = svgamesa.h
-INC_X11 = glx.h glxext.h glx_mangle.h xmesa.h xmesa_x.h xmesa_xf86.h
+INC_X11 = glx.h glxext.h glx_mangle.h
INC_GLUT = glut.h glutf90.h
-if HAVE_FX
-sel_inc_fx = $(INC_FX)
-endif
-
if HAVE_GGI
sel_inc_ggi = $(INC_GGI)
endif
@@ -35,9 +30,9 @@ endif
EXTRA_HEADERS = amesa.h dosmesa.h foomesa.h glut_h.dja mesa_wgl.h mglmesa.h \
vms_x_fix.h wmesa.h \
- $(INC_FX) $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11) $(INC_GLUT)
+ $(INC_GGI) $(INC_OSMESA) $(INC_SVGA) $(INC_X11) $(INC_GLUT)
GLinclude_HEADERS = gl.h glext.h gl_mangle.h glu.h glu_mangle.h \
- $(sel_inc_fx) $(sel_inc_ggi) $(sel_inc_osmesa) $(sel_inc_svga) \
+ $(sel_inc_ggi) $(sel_inc_osmesa) $(sel_inc_svga) \
$(sel_inc_x11) $(sel_inc_glut)
include $(top_srcdir)/common_rules.make
commit 287102ddcc72ae19f7e6b912205805c5e78771f7
Author: Brian Paul <bri...@vmware.com>
Date: Sat Jan 10 12:04:39 2009 -0700
mesa: deprecate GL/amesa.h header (allegro driver)
diff --git a/include/GL/amesa.h b/include/GL/amesa.h
deleted file mode 100644
index 852d34c..0000000
--- a/include/GL/amesa.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version: 3.3
- *
- * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is 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 Software.
- *
- * THE SOFTWARE IS 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
- * BRIAN PAUL 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-/* Allegro (DJGPP) driver by Bernhard Tschirren (berni...@geocities.com) */
-
-
-#ifndef AMESA_H
-#define AMESA_H
-
-
-#define AMESA_MAJOR_VERSION 3
-#define AMESA_MINOR_VERSION 3
-
-
-typedef struct amesa_visual *AMesaVisual;
-typedef struct amesa_buffer *AMesaBuffer;
-typedef struct amesa_context *AMesaContext;
-
-
-extern AMesaVisual AMesaCreateVisual(GLboolean dbFlag, GLint depth,
- GLint depthSize,
- GLint stencilSize,
- GLint accumSize);
-
-extern void AMesaDestroyVisual(AMesaVisual visual);
-
-extern AMesaBuffer AMesaCreateBuffer(AMesaVisual visual,
- GLint width, GLint height);
-
-extern void AMesaDestroyBuffer(AMesaBuffer buffer);
-
-
-extern AMesaContext AMesaCreateContext(AMesaVisual visual,
- AMesaContext sharelist);
-
-extern void AMesaDestroyContext(AMesaContext context);
-
-extern GLboolean AMesaMakeCurrent(AMesaContext context, AMesaBuffer buffer);
-
-extern void AMesaSwapBuffers(AMesaBuffer buffer);
-
-
-#endif /* AMESA_H */
diff --git a/src/mesa/drivers/allegro/amesa.c b/src/mesa/drivers/allegro/amesa.c
index ade6251..a9d8f62 100644
--- a/src/mesa/drivers/allegro/amesa.c
+++ b/src/mesa/drivers/allegro/amesa.c
@@ -26,7 +26,7 @@
#include "main/imports.h"
#include "main/matrix.h"
#include "main/mtypes.h"
-#include "GL/amesa.h"
+#include "amesa.h"
struct amesa_visual
diff --git a/src/mesa/drivers/allegro/amesa.h b/src/mesa/drivers/allegro/amesa.h
new file mode 100644
index 0000000..852d34c
--- /dev/null
+++ b/src/mesa/drivers/allegro/amesa.h
@@ -0,0 +1,65 @@
+/*
+ * Mesa 3-D graphics library
+ * Version: 3.3
+ *
+ * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is 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 Software.
+ *
+ * THE SOFTWARE IS 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
+ * BRIAN PAUL 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/* Allegro (DJGPP) driver by Bernhard Tschirren (berni...@geocities.com) */
+
+
+#ifndef AMESA_H
+#define AMESA_H
+
+
+#define AMESA_MAJOR_VERSION 3
+#define AMESA_MINOR_VERSION 3
+
+
+typedef struct amesa_visual *AMesaVisual;
+typedef struct amesa_buffer *AMesaBuffer;
+typedef struct amesa_context *AMesaContext;
+
+
+extern AMesaVisual AMesaCreateVisual(GLboolean dbFlag, GLint depth,
+ GLint depthSize,
+ GLint stencilSize,
+ GLint accumSize);
+
+extern void AMesaDestroyVisual(AMesaVisual visual);
+
+extern AMesaBuffer AMesaCreateBuffer(AMesaVisual visual,
+ GLint width, GLint height);
+
+extern void AMesaDestroyBuffer(AMesaBuffer buffer);
+
+
+extern AMesaContext AMesaCreateContext(AMesaVisual visual,
+ AMesaContext sharelist);
+
+extern void AMesaDestroyContext(AMesaContext context);
+
+extern GLboolean AMesaMakeCurrent(AMesaContext context, AMesaBuffer buffer);
+
+extern void AMesaSwapBuffers(AMesaBuffer buffer);
+
+
+#endif /* AMESA_H */
commit f5979b0c159d1d3839caf86072639f5d96a5b0b5
Author: Brian Paul <bri...@vmware.com>
Date: Sat Jan 10 12:01:40 2009 -0700
mesa: deprecate the GL/fxmesa.h header
diff --git a/include/GL/fxmesa.h b/include/GL/fxmesa.h
deleted file mode 100644
index f8e9661..0000000
--- a/include/GL/fxmesa.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version: 4.0
- * Copyright (C) 1995-2001 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.
- */
-
-
-/*
- * FXMesa - 3Dfx Glide driver for Mesa. Contributed by David Bucciarelli
- *
- * NOTE: This version requires Glide3 (http://sourceforge.net/projects/glide)
- */
-
-
-#ifndef FXMESA_H
-#define FXMESA_H
-
-
-#include <glide.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define FXMESA_MAJOR_VERSION 6
-#define FXMESA_MINOR_VERSION 3
-
-
-/*
- * Values for attribList parameter to fxMesaCreateContext():
- */
-#define FXMESA_NONE 0 /* to terminate attribList */
-#define FXMESA_DOUBLEBUFFER 10
-#define FXMESA_ALPHA_SIZE 11 /* followed by an integer */
-#define FXMESA_DEPTH_SIZE 12 /* followed by an integer */
-#define FXMESA_STENCIL_SIZE 13 /* followed by an integer */
-#define FXMESA_ACCUM_SIZE 14 /* followed by an integer */
-#define FXMESA_COLORDEPTH 20 /* followed by an integer */
-#define FXMESA_SHARE_CONTEXT 990099 /* keep in sync with xmesa1.c! */
-
-
-
-typedef struct tfxMesaContext *fxMesaContext;
-
-
-#if defined (__BEOS__)
-#pragma export on
-#endif
-
-
-GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,
GrScreenResolution_t,
- GrScreenRefresh_t,
- const GLint attribList[]);
-
-GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
- GLint width, GLint height,
- const GLint attribList[]);
-GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
-
-GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
-
-GLAPI void GLAPIENTRY fxMesaMakeCurrent(fxMesaContext ctx);
-
-GLAPI fxMesaContext GLAPIENTRY fxMesaGetCurrentContext(void);
-
-GLAPI void GLAPIENTRY fxMesaSwapBuffers(void);
-
-GLAPI void GLAPIENTRY fxMesaSetNearFar(GLfloat nearVal, GLfloat farVal);
-
-GLAPI void GLAPIENTRY fxMesaUpdateScreenSize(fxMesaContext ctx);
-
-GLAPI void GLAPIENTRY fxCloseHardware(void);
-
-GLAPI void GLAPIENTRY fxGetScreenGeometry (GLint *w, GLint *h);
-
-
-#if defined (__BEOS__)
-#pragma export off
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
diff --git a/src/mesa/drivers/x11/fxmesa.h b/src/mesa/drivers/x11/fxmesa.h
new file mode 100644
index 0000000..f8e9661
--- /dev/null
+++ b/src/mesa/drivers/x11/fxmesa.h
@@ -0,0 +1,103 @@
+/*
+ * Mesa 3-D graphics library
+ * Version: 4.0
+ * Copyright (C) 1995-2001 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.
+ */
+
+
+/*
+ * FXMesa - 3Dfx Glide driver for Mesa. Contributed by David Bucciarelli
+ *
+ * NOTE: This version requires Glide3 (http://sourceforge.net/projects/glide)
+ */
+
+
+#ifndef FXMESA_H
+#define FXMESA_H
+
+
+#include <glide.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define FXMESA_MAJOR_VERSION 6
+#define FXMESA_MINOR_VERSION 3
+
+
+/*
+ * Values for attribList parameter to fxMesaCreateContext():
+ */
+#define FXMESA_NONE 0 /* to terminate attribList */
+#define FXMESA_DOUBLEBUFFER 10
+#define FXMESA_ALPHA_SIZE 11 /* followed by an integer */
+#define FXMESA_DEPTH_SIZE 12 /* followed by an integer */
+#define FXMESA_STENCIL_SIZE 13 /* followed by an integer */
+#define FXMESA_ACCUM_SIZE 14 /* followed by an integer */
+#define FXMESA_COLORDEPTH 20 /* followed by an integer */
+#define FXMESA_SHARE_CONTEXT 990099 /* keep in sync with xmesa1.c! */
+
+
+
+typedef struct tfxMesaContext *fxMesaContext;
+
+
+#if defined (__BEOS__)
+#pragma export on
+#endif
+
+
+GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win,
GrScreenResolution_t,
+ GrScreenRefresh_t,
+ const GLint attribList[]);
+
+GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
+ GLint width, GLint height,
+ const GLint attribList[]);
+GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
+
+GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
+
+GLAPI void GLAPIENTRY fxMesaMakeCurrent(fxMesaContext ctx);
+
+GLAPI fxMesaContext GLAPIENTRY fxMesaGetCurrentContext(void);
+
+GLAPI void GLAPIENTRY fxMesaSwapBuffers(void);
+
+GLAPI void GLAPIENTRY fxMesaSetNearFar(GLfloat nearVal, GLfloat farVal);
+
+GLAPI void GLAPIENTRY fxMesaUpdateScreenSize(fxMesaContext ctx);
+
+GLAPI void GLAPIENTRY fxCloseHardware(void);
+
+GLAPI void GLAPIENTRY fxGetScreenGeometry (GLint *w, GLint *h);
+
+
+#if defined (__BEOS__)
+#pragma export off
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/src/mesa/drivers/x11/xmesaP.h b/src/mesa/drivers/x11/xmesaP.h
index 6a6c9ef..65e747d 100644
--- a/src/mesa/drivers/x11/xmesaP.h
+++ b/src/mesa/drivers/x11/xmesaP.h
@@ -30,7 +30,7 @@
#include "xmesa.h"
#include "main/mtypes.h"
#if defined(FX)
-#include "GL/fxmesa.h"
+#include "fxmesa.h"
#include "xm_glide.h"
#endif
#ifdef XFree86Server
commit d25cc16efa356a92f61f0b4836bcbd0b4cb606d2
Author: Brian Paul <bri...@vmware.com>
Date: Sat Jan 10 12:00:27 2009 -0700
mesa: remove the ancient include/GL/ugl*.h headers
diff --git a/include/GL/uglglutshapes.h b/include/GL/uglglutshapes.h
deleted file mode 100644
index 28192de..0000000
--- a/include/GL/uglglutshapes.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* uglglutshapes.h - Public header GLUT Shapes */
-
-/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */
-
-/* This program is freely distributable without licensing fees and is
- provided without guarantee or warrantee expressed or implied. This
- program is -not- in the public domain. */
-
-#ifndef GLUTSHAPES_H
-#define GLUTSHAPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <GL/gl.h>
-
-void glutWireSphere (GLdouble radius, GLint slices, GLint stacks);
-void glutSolidSphere (GLdouble radius, GLint slices, GLint stacks);
-void glutWireCone (GLdouble base, GLdouble height,
- GLint slices, GLint stacks);
-void glutSolidCone (GLdouble base, GLdouble height,
- GLint slices, GLint stacks);
-void glutWireCube (GLdouble size);
-void glutSolidCube (GLdouble size);
-void glutWireTorus (GLdouble innerRadius, GLdouble outerRadius,
- GLint sides, GLint rings);
-void glutSolidTorus (GLdouble innerRadius, GLdouble outerRadius,
- GLint sides, GLint rings);
-void glutWireDodecahedron (void);
-void glutSolidDodecahedron (void);
-void glutWireOctahedron (void);
-void glutSolidOctahedron (void);
-void glutWireTetrahedron (void);
-void glutSolidTetrahedron (void);
-void glutWireIcosahedron (void);
-void glutSolidIcosahedron (void);
-void glutWireTeapot (GLdouble size);
-void glutSolidTeapot (GLdouble size);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/GL/uglmesa.h b/include/GL/uglmesa.h
deleted file mode 100644
index 7ef5843..0000000
--- a/include/GL/uglmesa.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* uglmesa.h - Public header UGL/Mesa */
-
-/* Copyright (C) 2001 by Wind River Systems, Inc */
-
-/*
- * Mesa 3-D graphics library
- * Version: 4.0
- *
- * The MIT License
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is 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 Software.
- *
- * THE SOFTWARE IS 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 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 SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * Author:
- * Stephane Raimbault <stephane.raimba...@windriver.com>
- */
-
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
