summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2006-11-25 18:50:33 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2006-11-25 18:50:33 +0000
commitebd9f37f96e030b9cadc3f249cb73e4fc773f93b (patch)
treecca845e80581079cd43a51623f53754f9b1b8a82
parent5c446e9f1b5aaaf1a8b914de674318800c03f9d4 (diff)
Import MesaLibs 6.5.1. (in dist/ since its code is shared between lib
and xserver)...
Diffstat
-rw-r--r--dist/Mesa/configs/aix1
-rw-r--r--dist/Mesa/docs/README.MINGW3263
-rw-r--r--dist/Mesa/docs/relnotes-6.5.1.html76
-rw-r--r--dist/Mesa/docs/subset-A.html3
-rw-r--r--dist/Mesa/docs/subset.html17
-rw-r--r--dist/Mesa/include/GL/glfbdev.h3
-rw-r--r--dist/Mesa/src/mesa/main/depthstencil.h11
7 files changed, 34 insertions, 140 deletions
diff --git a/dist/Mesa/configs/aix b/dist/Mesa/configs/aix
index ebbf58374..313d4c4fd 100644
--- a/dist/Mesa/configs/aix
+++ b/dist/Mesa/configs/aix
@@ -13,6 +13,7 @@ CXXFLAGS = -O -DAIXV3 -DPTHREADS
# Misc tools and flags
MKLIB_OPTIONS =
+COPY_LIBS = cp -f -h
# Library names (actual file names)
GL_LIB_NAME = libGL.a
diff --git a/dist/Mesa/docs/README.MINGW32 b/dist/Mesa/docs/README.MINGW32
index 9477b2bd3..2b39f1209 100644
--- a/dist/Mesa/docs/README.MINGW32
+++ b/dist/Mesa/docs/README.MINGW32
@@ -88,66 +88,3 @@ Running the Build:
Paul G. <pgarceau@users.sourceforge.net>
Daniel Borca <dborca@users.sourceforge.net>
-
-
-
-******This section is added by Heromyth <zxpmyth@yahoo.com.cn>*************
-
-====================
-Updated on 2007-7-21
-====================
-
-Notice:
- 1) The generated DLLs are *not* compatible with the ones built
-with the other compilers like VC8, especially for GLUT.
-
- 2) Although more tests are needed, it can be used individually!
-
- 3) You can set the options about whether using STDCALL to build MESA. The
-config file is <Mesa3D-root>\configs\config.mgw. The default setting is that:
- ALL_USING_STDCALL = 1
-, which means using STDCALL to build MESA.
-
- 4) Of course, you can MESA without using STDCALL,I like this:)
-The setting is :
- ALL_USING_STDCALL = 0
-To do this, however, you must modify wingdi.h which is in MingW's include dir.
-For example, run:
- notepad C:\MingW\include\wingdi.h
-, and delete all the lines where all the wgl*() functions are. Because they would
-be conflicted with the ones in <Mesa3D-root>\include\GL\mesa_wgl.h.
-
->>>>>>>>>> Conflicted Functions List >>>>>>>>>>
-WINGDIAPI BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT);
-WINGDIAPI HGLRC WINAPI wglCreateContext(HDC);
-WINGDIAPI HGLRC WINAPI wglCreateLayerContext(HDC,int);
-WINGDIAPI BOOL WINAPI wglDeleteContext(HGLRC);
-WINGDIAPI BOOL WINAPI wglDescribeLayerPlane(HDC,int,int,UINT,LPLAYERPLANEDESCRIPTOR);
-WINGDIAPI HGLRC WINAPI wglGetCurrentContext(void);
-WINGDIAPI HDC WINAPI wglGetCurrentDC(void);
-WINGDIAPI int WINAPI wglGetLayerPaletteEntries(HDC,int,int,int,COLORREF*);
-WINGDIAPI PROC WINAPI wglGetProcAddress(LPCSTR);
-WINGDIAPI BOOL WINAPI wglMakeCurrent(HDC,HGLRC);
-WINGDIAPI BOOL WINAPI wglRealizeLayerPalette(HDC,int,BOOL);
-WINGDIAPI int WINAPI wglSetLayerPaletteEntries(HDC,int,int,int,const COLORREF*);
-WINGDIAPI BOOL WINAPI wglShareLists(HGLRC,HGLRC);
-WINGDIAPI BOOL WINAPI wglSwapLayerBuffers(HDC,UINT);
-WINGDIAPI BOOL WINAPI wglUseFontBitmapsA(HDC,DWORD,DWORD,DWORD);
-WINGDIAPI BOOL WINAPI wglUseFontBitmapsW(HDC,DWORD,DWORD,DWORD);
-WINGDIAPI BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
-WINGDIAPI BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT);
-<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-
-====================
-Updated on 2007-7-22
-====================
- I havn't thought that I would find a better way to solve my problems so soon.
-I changed the method in which the import-libs and DLLs are made. After this update,
-the DLLs of MESA are more optimized and more compatible.
- It seems that there is no need to keep the building way of 'NO-STDCALL'.The
-way of USING_STDCALL is so nice! The file <Mesa3D-root>\configs\config.mgw is
-also not needed, and can be deleted safely!
-
-
-
-********************************************************************************* \ No newline at end of file
diff --git a/dist/Mesa/docs/relnotes-6.5.1.html b/dist/Mesa/docs/relnotes-6.5.1.html
index 0f03f931e..0640e992b 100644
--- a/dist/Mesa/docs/relnotes-6.5.1.html
+++ b/dist/Mesa/docs/relnotes-6.5.1.html
@@ -8,29 +8,26 @@
<body bgcolor="#eeeeee">
-<H1>Mesa 6.5.1 Release Notes / September 15, 2006</H1>
+<H1>Mesa 6.5.1 Release Notes</H1>
+
+
+
+<H2>Introduction</H2>
<p>
-Mesa 6.5.1 is a 6.5 follow-on development release mostly consisting of
-bug fixes.
+Mesa uses an even/odd version number scheme like the Linux kernel.
+Odd numbered versions (such as 6.5) designate new developmental releases.
+Even numbered versions (such as 6.4) designate stable releases.
</p>
-
-<h2>MD5 checksums</h2>
-<pre>
-d9a555297319bb932a3192952d53d073 MesaLib-6.5.1.tar.gz
-c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2
-939eaaff33322bfeafac784402b45f4f MesaLib-6.5.1.zip
-9e4bbe83c007bfbaa67449a81cc3d36a MesaDemos-6.5.1.tar.gz
-0f2794baf7a9d98b22caea9f78c6942d MesaDemos-6.5.1.tar.bz2
-14c77eab9cc7a265c331abf239927c1c MesaDemos-6.5.1.zip
-c5f87c23aaf4eaf1bda0d007ea98366c MesaGLUT-6.5.1.tar.gz
-2525642fe7f454e3e1a1aad01359b406 MesaGLUT-6.5.1.tar.bz2
-e33b165c22551e23b58ede8767378543 MesaGLUT-6.5.1.zip
-</pre>
+<p>
+Mesa 6.5.1 is a 6.5 follow-on development release mostly consisting of
+<a href="versions.html#6.5.1">bug fixes</a>.
+</p>
<h2>New Features</h2>
+
<ul>
<li>Intel i965 "broadwater" DRI driver
@@ -41,53 +38,6 @@ e33b165c22551e23b58ede8767378543 MesaGLUT-6.5.1.zip
<li>GL_EXT_gpu_program_parameters - addes a few new functions for setting
multiple vertex/fragment program parameters with one call.
-<li>"engine" demo
-<li>updated fbdev driver and GLUT for fbdev (Sean D'Epagnier)
-<li>many updates to the DRI drivers
-</ul>
-
-<h2>Changes</h2>
-<ul>
-<li>The glVertexAttribARB functions no longer alias the conventional
- vertex attributes.
-<li>glxinfo program prints more info with -l option
-<li>GL_FRAGMENT_PROGRAM_NV and GL_FRAGMENT_PROGRAM_ARB are now
- compatible, in terms of glBindProgramARB()
-<li>The GL_ARB_vertex_program attribute <code>vertex.weight</code> is now
- accepted by the parser, even though the GL_ARB_vertex_blend and
- GL_EXT_vertex_weighting extensions aren't supported.
- Allows Warcraft to run.
-</ul>
-
-<h2>Bug fixes</h2>
-<ul>
-<li>fixed broken texture border handling for depth textures (bug 6498)
-<li>removed the test for duplicated framebuffer attachments, per
- version 117 of the GL_EXT_framebuffer_object specification
-<li>fixed a few render-to-texture bugs, including render to depth texture
-<li>clipping of lines against user-defined clip planes was broken (6512)
-<li>assembly language dispatch for SPARC was broken (bug 6484)
-<li>assorted compilation fixes on various Unix platforms (Dan Schikore)
-<li>glPopAttrib could restore an invalid value for GL_DRAW_BUFFER
-<li>assorted minor fixes for 16 and 32 bit/channel modes
-<li>fixed assorted bugs in texture compression paths
-<li>fixed indirect rendering vertex array crashes (bug 6863)
-<li>glDrawPixels GL_INDEX_OFFSET didn't always work
-<li>fixed convolution memory leak (bug 7077)
-<li>rectangular depth textures didn't work
-<li>invalid mode to glBegin didn't generate an error (bug 7142)
-<li>'normalized' parameter to glVertexAttribPointerARB didn't work
-<li>disable bogus GLX_SGI_video_sync extension in xlib driver
-<li>fixed R128 driver locking bug (Martijn van Oosterhout)
-<li>using evaluators with vertex programs caused crashes (bug 7564)
-<li>fragment.position wasn't set correctly for point/line primitives
-<li>fixed parser bug for scalar sources for GL_NV_fragment_program
-<li>max fragment program length was incorrectly 128, now 1024
-<li>writes to result.depth in fragment programs weren't clamped to [0,1]
-<li>fixed potential dangling pointer bug in glBindProgram()
-<li>fixed some memory leaks (and potential crashes) in Xlib driver
-<li>fixed a number of build issues on HP-UX (Christopher Bell)
-<li>accum buffer didn't work with OSMesa interface
</ul>
diff --git a/dist/Mesa/docs/subset-A.html b/dist/Mesa/docs/subset-A.html
index d576bb674..dac66a61b 100644
--- a/dist/Mesa/docs/subset-A.html
+++ b/dist/Mesa/docs/subset-A.html
@@ -16,7 +16,8 @@
</h3>
</center>
</h2>
-<p> Copyright &copy; 2002-2003 by Tungsten Graphics, Inc.,
+<p> Copyright &copy; 2002-2003 by <a
+ href="http://www.tungstengraphics.com/">Tungsten Graphics, Inc.</a>,
Cedar Park, Texas. All Rights Reserved. <br>
<br>
Permission is granted to make and distribute verbatim copies of this
diff --git a/dist/Mesa/docs/subset.html b/dist/Mesa/docs/subset.html
index 4ac2eadff..dd1d742a8 100644
--- a/dist/Mesa/docs/subset.html
+++ b/dist/Mesa/docs/subset.html
@@ -1,18 +1,17 @@
<HTML>
-<TITLE>Mesa Subset Driver</TITLE>
+<TITLE>Mesa Subset</TITLE>
<link rel="stylesheet" type="text/css" href="mesa.css"></head>
<BODY>
-<H1>Mesa Subset Driver</H1>
+<H1>Mesa Subset</H1>
<p>
In 2002/2003 Tungsten Graphics was contracted to develop a subset Mesa/Radeon
driver for an embedded environment. The result is a reduced-size DRI driver
-for the ATI R200 chip, for use with
-<a href="fbdev-dri.html">fbdev/DRI environment</a>.
+for the ATI R200 chip, for use with Linux fbdev rather than XFree86.
</p>
<p>
@@ -20,5 +19,15 @@ The specification for this subset can be found
<a href="subset-A.html">here</a>.
</p>
+<p>
+The <a href="MiniGLX.html">MiniGLX specification</a> describes the
+interface between fbdev and Mesa.
+</p>
+
+<p>
+More info to come...
+</p>
+
+
</BODY>
</HTML>
diff --git a/dist/Mesa/include/GL/glfbdev.h b/dist/Mesa/include/GL/glfbdev.h
index 452a643a4..4e25e7b05 100644
--- a/dist/Mesa/include/GL/glfbdev.h
+++ b/dist/Mesa/include/GL/glfbdev.h
@@ -27,9 +27,6 @@
#define GLFBDEV_H
-/* for size_t */
-#include <stdlib.h>
-
/* avoid including linux/fb.h */
struct fb_fix_screeninfo;
struct fb_var_screeninfo;
diff --git a/dist/Mesa/src/mesa/main/depthstencil.h b/dist/Mesa/src/mesa/main/depthstencil.h
index ef63c5d7a..3dde081f5 100644
--- a/dist/Mesa/src/mesa/main/depthstencil.h
+++ b/dist/Mesa/src/mesa/main/depthstencil.h
@@ -26,32 +26,31 @@
#ifndef DEPTHSTENCIL_H
#define DEPTHSTENCIL_H
-struct gl_context;
extern struct gl_renderbuffer *
-_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,
+_mesa_new_z24_renderbuffer_wrapper(GLcontext *ctx,
struct gl_renderbuffer *dsrb);
extern struct gl_renderbuffer *
-_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx,
+_mesa_new_s8_renderbuffer_wrapper(GLcontext *ctx,
struct gl_renderbuffer *dsrb);
extern void
-_mesa_extract_stencil(struct gl_context *ctx,
+_mesa_extract_stencil(GLcontext *ctx,
struct gl_renderbuffer *dsRb,
struct gl_renderbuffer *stencilRb);
extern void
-_mesa_insert_stencil(struct gl_context *ctx,
+_mesa_insert_stencil(GLcontext *ctx,
struct gl_renderbuffer *dsRb,
struct gl_renderbuffer *stencilRb);
extern void
-_mesa_promote_stencil(struct gl_context *ctx, struct gl_renderbuffer *stencilRb);
+_mesa_promote_stencil(GLcontext *ctx, struct gl_renderbuffer *stencilRb);
#endif /* DEPTHSTENCIL_H */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 02:51:34 +0000