Compare commits

...

1957 Commits

Author SHA1 Message Date
Vladimir Dergachev
4a04f002db Add missing files. 2004-12-30 16:06:37 +00:00
Keith Whitwell
8f1ba083ba Initialize depth pointer correctly. 2004-12-30 16:05:07 +00:00
Keith Whitwell
58cc2e9124 Don't need to adjust for drawXoff in fallback clipping. 2004-12-30 15:58:45 +00:00
Keith Whitwell
18551e75ea fix regression with fallbacks from recent commits 2004-12-30 14:32:19 +00:00
Keith Whitwell
6fcc6c4965 Fix MagFilter state for texunit 0 2004-12-30 14:21:46 +00:00
Vladimir Dergachev
bcd1a9ed68 Update vertex buffer code (still does not work properly..) 2004-12-30 11:43:04 +00:00
Vladimir Dergachev
2269445f6d Update to recent r300_lib.
Cleanup code that is not relevant anymore.
Play with unknown2 parameter.
2004-12-30 11:17:42 +00:00
Vladimir Dergachev
b53030a94c Hooked up projection matrix - the gears actually rotate ! 2004-12-30 10:27:04 +00:00
Vladimir Dergachev
a656dc251e Restructure code.
Add drawing code that uses vertex buffers - does not lockup, but does not draw correctly either.. Perhaps something to do with vertices being overwritten ?
Start using hardware state retained by the driver and cut back on direct register writes significantly.
2004-12-30 10:11:39 +00:00
Vladimir Dergachev
51050efe0e Change default RS settings so that glxgears will display something.. 2004-12-30 07:50:15 +00:00
Vladimir Dergachev
7d8c1fb03a Clarify some of the unkXXXX atoms. 2004-12-30 07:11:28 +00:00
Vladimir Dergachev
74bf43051c Port viewport setting code from R200.
Take it outside R300ResetHwState.
2004-12-30 06:06:54 +00:00
Keith Whitwell
5be14fd59a Fix some wrapping bugs in the last commit. Probably there are more
remaining.
2004-12-29 21:17:06 +00:00
Keith Whitwell
490e764d7a Simplfy clear() and swapbuffers() code.
Fix various mishandling of cliprects.
Allow multiple primitives to be emitted to a single dma buffer, which
was largely impossible previously.
Re-enable the fast unclipped render stage.
2004-12-29 20:46:27 +00:00
Keith Whitwell
ef494c06b6 Use Point._Size in calculation 2004-12-29 14:38:17 +00:00
Keith Whitwell
54ef88109b use clamped Line._Width in calculations 2004-12-29 14:36:58 +00:00
Keith Whitwell
e158292ee3 Don't advertise wide lines or points. 2004-12-29 14:09:21 +00:00
Keith Whitwell
e972497310 Make line stipple a fallback.
Make sure fallbacks are wrapped by SpanRenderStart/SpanRenderFinish
2004-12-29 14:06:09 +00:00
Keith Whitwell
f102f7ae3d Don't pingpong cliprects through sarea on CopyBuffer(). 2004-12-29 14:05:16 +00:00
Keith Whitwell
cb0cc796d2 Fallback on 3d textures correctly. 2004-12-29 13:03:12 +00:00
Keith Whitwell
3b486d795d Get twoside-lit triangles working again 2004-12-29 12:48:50 +00:00
Keith Whitwell
13ae06cf36 Large update
- Remove via duplicates of shared template files
	- Update driver to work with current versions of the above
	- Rework dma accounting
	- Rework emitting to dma to use a consistent set of macros

The handling of cliprects in the driver is still pretty questionable.
2004-12-29 12:39:50 +00:00
Vladimir Dergachev
7b05b70c2a Rearrange code so we don't dump state as often. 2004-12-29 04:51:46 +00:00
Vladimir Dergachev
4c3f041862 Get most primitives working using immediate mode.
Glxgears displays "rotating" gears, all in the same place (no transform mode, remember ?)
Work needs to be done to understand how to have glxgears working properly.
2004-12-29 04:33:33 +00:00
Vladimir Dergachev
5bdb4652f9 Bring in latest revision of r300_lib.
New capabilities: using vertex buffers, immediate vertex data, immediate indices.
2004-12-29 03:48:05 +00:00
Vladimir Dergachev
6a50fc43cb Use R300_CMD_END3D for end_3d(). 2004-12-27 23:30:39 +00:00
Adam Jackson
c6cca6a3b8 Fix read-from-uninitialized in s3vMakeCurrent() 2004-12-27 22:57:05 +00:00
Adam Jackson
29c88396db Unused variable cleanup. 2004-12-27 22:08:34 +00:00
Adam Jackson
d9fcfa2797 Bug #1859: Initialize 'size' before first use in intelTryReadPixels() 2004-12-27 21:52:17 +00:00
Adam Jackson
0983c9dd99 Build s3v and trident by default too.
Smoky the bear says: Only you can prevent bitrot.
2004-12-27 20:38:29 +00:00
Adam Jackson
c3eaa17b37 Get s3v building with a minimum of warnings. 2004-12-27 20:31:56 +00:00
Vladimir Dergachev
99edafd4e8 Implement rendering of (flat color) QUAD primitives as an experiment. 2004-12-27 17:18:48 +00:00
Ian Romanick
83fcf49647 Fixed two problems with the handling of GLX protocol replies. The logic
for determining when extra data needed to be read after a reply (to ensure
4-byte alignment) and the logic to determine whether or not to read reply
data after the SingleReply packet were both slightly wrong.
2004-12-27 08:29:54 +00:00
Vladimir Dergachev
3cbc2bd833 Expose primitive types being rendered, in preparation to implement fixed pipeline primitive drawing.
Note: these are only visible when export LIBGL_DEBUG=verbose is specified.
2004-12-26 21:42:14 +00:00
Vladimir Dergachev
1b2a655521 Update with most recent version. 2004-12-26 19:32:21 +00:00
Adam Jackson
46a35b2284 Get trident building and -Werror clean.
- Added Makefile
- Deleted references to old headers
- Added prototypes all over the place
- Lots of type updates (drmHandle -> drm_handle_t etc.)
- Added __driCreateNewScreen(), deleted __driCreateScreen()
- Fixed context creation to match other drivers
- Fixed various bitfield names
- Bumped driver date

Still nowhere close to usable, the DDX isn't DRI-aware and there's no DRM.
2004-12-24 03:04:14 +00:00
Felix Kuehling
1c86c7ad9c Simplified and optimized _savage_texnorm_stage. 2004-12-23 20:26:59 +00:00
Keith Whitwell
3deaf21745 Remove the VIA_PERFORMANCE code. A step towards moving the driver
back to using the shared template files.
2004-12-23 18:26:40 +00:00
Keith Whitwell
9876730f7a Chop out more dead code.
Get the drawXoff adjustment working a bit better.
Seems to pass the glean orthoPos tests.
2004-12-23 18:16:22 +00:00
Keith Whitwell
15da29b5e7 Fix merge error. 2004-12-22 19:31:10 +00:00
Keith Whitwell
7db50bb3a8 Remove dead code.
Fix 24/8 depth/stencil visuals.
2004-12-22 19:30:02 +00:00
Felix Kuehling
922bfd70ff Enabled hardware rendering of 1D textures. No need for a software fallback. 2004-12-22 16:12:59 +00:00
Felix Kuehling
80dd3c7917 - Fake projective textures on a single texture unit. A fallback is only
needed if a second texture unit is enabled.
- Also worked around an application bug in Chromium B.S.U.: it sends 3D
  texture coordinates while only a 2D texture is enabled. This used to
  trigger a PTEX fallback. Now the 3rd coordinate is just ignored.
- Fixed the _savage_texnorm_stage to never normalize homogenous texture
  coordinates.
2004-12-22 00:21:32 +00:00
Keith Whitwell
8bdaa927eb Remove debug code which referenced an old global variable. 2004-12-21 23:07:13 +00:00
Ian Romanick
990dec7ea0 Used GCC's __builtin_expect when available. Change the way code is
generated for commands that can use RenderLarge packets.  Tweak the code for
__glXFlushRenderBuffer slightly.
2004-12-21 23:06:02 +00:00
Keith Whitwell
302c5694c6 Push a number of global variables into the viaContext struct.
Remove the bogus 'current_vmesa' pointer.
2004-12-21 22:42:00 +00:00
Ian Romanick
1d27084043 Added some comments and fixed typeos. Slightly refactored the way
function parameters are iterated.  There are no changes in the generated
code.
2004-12-21 21:26:36 +00:00
Daniel Borca
b756990b84 t' was not initialized (use texture' instead?) 2004-12-21 15:45:41 +00:00
Brian Paul
3ec0631e95 fix bug in _mesa_IsTexture() 2004-12-21 15:13:41 +00:00
Keith Whitwell
50694eeff9 Note that state is dirty on contended lock. Allows two applications
to run together correctly, though scheduling between them still isn't
great.
2004-12-21 13:23:10 +00:00
Keith Whitwell
3955313e7c Add missing swap-control calculations.
Remove debug printf.
2004-12-21 12:35:04 +00:00
Keith Whitwell
314f8e4d9d Add vsync swapbuffers. This waits on the irq so gears run in this mode
will have a very low cpu utilization (and also a very low framerate).

Fix up the pageflipping code.  This works now but is totally oblivious
to the X server (ie. it works but it's broken).  Turned off by a #define.
2004-12-21 11:57:03 +00:00
Daniel Borca
91a04617c4 added GL_EXT_stencil_two_side (yes, it works) 2004-12-21 08:21:52 +00:00
Daniel Borca
d7b9d6046d missing `or' in preprocessor conditional 2004-12-21 08:05:43 +00:00
Keith Whitwell
16db15718d Add a -fullscreen option 2004-12-20 14:48:19 +00:00
Keith Whitwell
14bc684990 Remove #ifdef DEBUG's in code, but still allow compiler to remove debug
code if DEBUG not defined.
2004-12-20 12:52:21 +00:00
Daniel Borca
b51600716e put back clipmask code; it proved to be a MinGW/gcc 3.3.x error in t_vb_cliptmp.h(47), where it would still send clipped vertices to the hw... oh, dear... 2004-12-20 08:24:10 +00:00
Daniel Borca
6bb1be010e use float constants.
fixed a small debug error.
2004-12-20 08:20:39 +00:00
Daniel Borca
7799294459 removed ifdef'ed out code (to whom it may concern: it can be found in dri/tdfx driver) 2004-12-20 08:19:28 +00:00
Daniel Borca
16d4166d14 removed detritus (ncc). 2004-12-20 08:18:19 +00:00
Daniel Borca
7b50d773d3 comment reorg.
removed detritus (ncc).
2004-12-20 08:17:36 +00:00
Daniel Borca
ad149e3e65 made some functions static. 2004-12-20 08:16:24 +00:00
Daniel Borca
9e821269fc comment reorg.
made some functions static.
hide vp behind an envvar.
removed unnecessary multitex constraint for napalm hw.
2004-12-20 08:15:50 +00:00
Daniel Borca
6a7b4690e3 allow greater swappendingcount for older hw (v1/v2) 2004-12-20 08:12:09 +00:00
Daniel Borca
00b7aba567 misc cleanup 2004-12-20 08:09:25 +00:00
Daniel Borca
0d7da6c3e0 allow ARB vp/fp query program errors 2004-12-20 08:08:15 +00:00
Daniel Borca
2982dce27e really protect against npot compressed textures (logbase2 never returns -1). 2004-12-20 08:03:01 +00:00
Ian Romanick
0d84c68313 Use GLX protocol code generated by glX_proto_send.py. 2004-12-20 04:53:00 +00:00
Ian Romanick
46be433c47 No GLX protocol for GL_ATI_fragment_shader. 2004-12-20 04:47:46 +00:00
Vladimir Dergachev
55fb41ade8 Fix cut and paste error (reported by Jerome Glisse) 2004-12-19 15:39:40 +00:00
Dave Airlie
7f752fed99 Implement software ATI_fragment_shader
no error detection, slow, may not be 100% correct but a good start
2004-12-19 03:06:59 +00:00
Brian Paul
a803b0c891 Consolidate _swrast_write_texture_span() into _swrast_write_rgba_span(). 2004-12-18 22:03:07 +00:00
Brian Paul
feac302567 added GL_ARB_pixel_buffer_object extension string 2004-12-18 16:19:08 +00:00
Brian Paul
2a5afe3ab8 Added PRINT instruction for GL_NV_fragment_program. 2004-12-18 16:18:00 +00:00
Thomas Hellström
6cec977773 Unichrome DRI driver:
Fix for proplem where polygons partly outside the drawing window would get
one vertex clamped to the opposite window side. This bug could also cause
a hardlock. (Bugzilla #2066, Yann Vernier)
2004-12-18 12:16:12 +00:00
Felix Kuehling
3d04879801 Made debugging output controllable via environment variable
SAVAGE_DEBUG. Added fallback debugs. Added no_rast option to disable
hardware rasterization (everything as software fallback).
2004-12-17 15:55:17 +00:00
Brian Paul
538541e300 VMS update 2004-12-17 14:48:00 +00:00
Daniel Borca
cf95169542 fxRasterPrimitive wasn't always receiving the reduced primitive 2004-12-17 10:40:32 +00:00
Daniel Borca
02978f1092 fxRasterPrimitive wasn't always receiving the reduced primitive 2004-12-17 08:08:37 +00:00
Felix Kuehling
0d39c4ebc9 Added a TNL pipeline stage that normalizes texture coordinates as a
workaround for bad Savage hardware interpolation of big texture
coordinates.
2004-12-17 00:01:15 +00:00
Adam Jackson
c403bcb8a7 Import s3virge and trident drivers. Not functional yet; no Makefile, no DRI-aware DDX. 2004-12-16 19:26:23 +00:00
Brian Paul
8662c5d98f fix typos in texcoord setup - fixes perspective correction bug 2004-12-16 17:33:36 +00:00
Vladimir Dergachev
7771c92d35 The types uint32_t and uint8_t are not used in Mesa tree.
Put a couple of defines to use GL counterparts.
2004-12-16 14:04:49 +00:00
Brian Paul
575700fbdc Experimental PRINT instruction for NV_vertex_program.
Basically, this lets you put a "PRINT 'mesage', register;" statement in a
vertex program to aid in debugging.
2004-12-16 03:07:18 +00:00
Brian Paul
c75900e7a2 don't divide texcoords by q if using a fragment program 2004-12-16 02:14:19 +00:00
Adam Jackson
d16aa9859c Also PUBLICize the config option table 2004-12-16 00:23:47 +00:00
Adam Jackson
3d7aec70c9 Mark __driCreateNewScreen PUBLIC 2004-12-15 23:26:49 +00:00
Adam Jackson
791ce02244 _glapi_* is effectively PUBLIC API for the DRI drivers. 2004-12-15 23:14:29 +00:00
Adam Jackson
4890f2605e Mark the XF86DRI client-side extension API as PUBLIC. 2004-12-15 23:07:55 +00:00
Adam Jackson
2719b54f53 fxt1_decode_1() needs to be non-static for the tdfx and glide drivers. 2004-12-15 22:57:59 +00:00
Thomas Hellström
20456d6a3d Unichrome DRI:
Updated the driver to the new VIA security mechanisms in DRM. All command
submissions now passes through DRM ioctls. If the DRM AGP ring-buffer is
not enabled, it will use a DRM mechanism for submitting commands to the
hardware via a PCI bus mechanism.

Removed all direct write accesses to the hardware. Among other things the
VQ was previously turned off for the PCI path, apparently for Tuxracer.
That seemed unneeded and was removed. No visible impact on Tuxracer.

Abstracted all buffer blit operations in via_ioctl.c. The blitter context
is now reprogrammed before each blitting operation.

Updated driver date and drm version requirement.
(Bugzilla Bug #1950, Thomas Hellstrm)
2004-12-15 21:59:25 +00:00
Thomas Hellström
b4f58e99eb Unichrome DRI:
Stop the driver from giving empty texture levels with erroneous HW addresses
to the hardware. These will get caught and rejected in the DRM command
verifier.
2004-12-15 21:27:49 +00:00
Thomas Hellström
de541439d3 Unichrome DRI:
Fixed an apparent race condition during locking and drawable info updating,
the result of which was the DRI client leaving traces on the screen rendering
where the drawable previously had been.
If the driver hangs X for a second or so and then restarts, this is probably
the place to look. (Thomas Hellstrm)
2004-12-15 21:17:51 +00:00
Thomas Hellström
a47c4c37ce Unichrome DRI driver:
Check for texture allocation failure (Bugzilla #1633, Bartlomiej Krol)
Reenabled AGP textures (Thomas Hellstrm)
2004-12-15 21:05:26 +00:00
Felix Kuehling
58f5b91b1b Added configuration support to the Savage driver. Three options are
supported so far.
2004-12-15 17:45:23 +00:00
Adam Jackson
489ccef398 Fix up glx/x11 to work when built with -fvisibility=hidden. 2004-12-15 17:18:06 +00:00
Felix Kuehling
5566127701 Fixed GL_CLAM_TO_EDGE. It's not supported in hardware. Use GL_CLAMP
instead of GL_REPEAT.
2004-12-15 16:59:58 +00:00
Felix Kuehling
e9fbc23024 Fixed initialization of some stencil-related S4 registers, which was
misplaced in savageDDInitState_s3d, where was overwriting completely
unrelated S3D registers with garbage.
2004-12-15 16:54:19 +00:00
Felix Kuehling
91fd299b6b Moved some code from savageCreateContext to savageInitDriver, where it
belongs. Removed some obviously useless code. Fixed computation of
MaxTextureLevels.
2004-12-15 16:50:57 +00:00
Felix Kuehling
9fb668c576 Fixed some missing uint8_t -> u_int8_t. 2004-12-15 15:44:28 +00:00
Keith Whitwell
cc488b03a3 Add _mesa_delete_texture_object() call to viaDeleteTexture
[Freedesktop BUG 2080]
2004-12-15 13:59:47 +00:00
Keith Whitwell
ae68c3212b Add some catchall commands to realclean target to remove built files
which are forgotten about when the configs/current symlink changes.
2004-12-15 11:03:41 +00:00
Daniel Borca
3f1205819a updated makefiles for gcc 3.4.3 and bnu 2.15 2004-12-15 08:00:43 +00:00
Daniel Borca
65dfab66e5 minor info update 2004-12-15 07:56:49 +00:00
Daniel Borca
8b563fd4c5 added DMesaProc type to prevent gcc 3.4.3 warnings 2004-12-15 07:55:38 +00:00
Daniel Borca
654dccfd85 added DMesaProc type to prevent gcc 3.4.3 warnings.
sw tc is disabled by default
2004-12-15 07:54:20 +00:00
Daniel Borca
ea38858127 protected elfish code against non-elf compilers 2004-12-15 07:52:35 +00:00
Brian Paul
3df033a93b fixes for fragment programs 2004-12-15 01:13:39 +00:00
Brian Paul
69a5896238 init span.w, dwdx, dwdy in case we're running a fragment program 2004-12-15 01:11:36 +00:00
Brian Paul
55481b3a29 tweaks to the LIT instructions 2004-12-15 01:07:52 +00:00
Brian Paul
244adeb639 s/DP3/DP3_SAT/ to prevent negative values 2004-12-15 00:54:17 +00:00
Alan Hourihane
968cbf94d9 uint*t -> u_int*t 2004-12-14 22:37:46 +00:00
Alan Hourihane
fc84bec654 fix warning 2004-12-14 10:59:37 +00:00
Alan Hourihane
38b317d508 uint*t -> u_int*t changes 2004-12-14 09:11:52 +00:00
Ian Romanick
9fb024ba97 Added many (hopefully all) missing 'output="true"' attributes. Added
missing enum information for GL_EXT_cull_vertex and
GL_SGIS_texture_color_mask.  Added GL_SUN_mesh_array.  Corrected the
spelling of the "length" parameter to GetActiveUniformARB.
2004-12-13 23:58:09 +00:00
Ian Romanick
dea44ca491 Trivial shell script to search the API definition file and print out the
next numerically available API entry-point offset.
2004-12-13 21:26:50 +00:00
Daniel Borca
8c0b1d8826 disabled ClipMask usage in vb emitter (clipping bugs?) 2004-12-13 08:44:46 +00:00
Brian Paul
8402149766 removed unused visInfo var 2004-12-12 22:24:09 +00:00
Brian Paul
af808afbe7 fix recursion problem introduced on Nov 27 2004-12-12 22:22:10 +00:00
Brian Paul
68d293b035 Added driver hooks for GetTexImage() and GetCompressedTexImage().
Added fallback _mesa_get_[compressed]_teximage() routines to texstore.c
2004-12-12 19:03:16 +00:00
Keith Whitwell
5aa1a111a4 Fix a couple of glitches 2004-12-10 17:18:00 +00:00
Daniel Borca
3cc28c96cd allow GetTexImage with RGBA format and COLOR_INDEX internalformat 2004-12-10 07:36:35 +00:00
Brian Paul
7af80ca8c1 typo 2004-12-09 23:23:14 +00:00
Brian Paul
a8158599df bring in 6.2.1 changes 2004-12-09 23:21:36 +00:00
Brian Paul
8597dd3e96 check if using a PBuffer in clip_for_xgetimage() 2004-12-09 16:23:03 +00:00
Keith Whitwell
da3e15c2fd Get linux-solo dependencies building correctly,
Make sure symlinks are built in driver directories before running makedepend.
2004-12-09 08:42:19 +00:00
Daniel Borca
2fc3a958a4 make sure we're cleaning up everything 2004-12-09 07:44:37 +00:00
Daniel Borca
a280d3347a simplistic ICD implementation for fx/Mesa 2004-12-09 07:43:59 +00:00
Dave Airlie
0e01b23798 back out Keiths last checkin - for Solo the include order is important 2004-12-09 00:25:06 +00:00
Dave Airlie
b2ad61fd40 fixup pci code for Jon's last checkin for changing page size 2004-12-09 00:18:59 +00:00
Roland Scheidegger
b31b7836d6 (Stephane Marchesin, me) add hyperz support to radeon and r200 drivers. Only fast z clear and z buffer compression are supported for now, hierarchical-z is not. Still problems with multiple apps and z/stencil readback, which is why hyperz is disabled per default. Also add the new point sprite packet drm 1.13 accepts to the sanity code. 2004-12-08 17:32:46 +00:00
Keith Whitwell
fc23672327 Improve the behaviour of the build system wrt depend files.
- Remove the -Y option for makedepend, so that the standard
	  directories are searched
	- No longer pipe the multiple errors that the -Y option caused
	  into /dev/null -- we want to know about these failures.
	- Fix up a few other misc makedepend failures.
2004-12-08 15:16:36 +00:00
Keith Whitwell
e5aa3dd29b Demonstrate using a color matrix for yuv-to-rgb conversion at texture
upload time.
2004-12-08 14:56:40 +00:00
Alan Hourihane
c69d60fbe4 Use union type to avoid strict aliasing problems. 2004-12-08 14:26:48 +00:00
Alan Hourihane
c63f3cf85d silence warnings 2004-12-08 14:00:46 +00:00
Alan Hourihane
8635615501 Check for some header defines before redefining functions. Silences warnings. 2004-12-08 12:59:15 +00:00
Alan Hourihane
03dc05a605 silence warning 2004-12-08 12:35:55 +00:00
Dave Airlie
23b033ad28 From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Attached is a patch that adds pci init code for mesa solo on radeon. It's been
tested on an itanium 2 with a radeon 7000 and it works here.
The patch adds a new field in the miniglx.conf config file, to choose between
pci and agp.
2004-12-08 06:15:01 +00:00
Roland Scheidegger
e1b4fec71c fix depth/stencil readback if coordinates are larger than 1023 (https://bugs.freedesktop.org/show_bug.cgi?id=2010). Should now work up to 2047, which is the current limit for 3d rendering. 2004-12-08 03:07:34 +00:00
Daniel Borca
3b65cab455 fixed an include path 2004-12-07 15:57:33 +00:00
Daniel Borca
c049d4bc89 explicit cast in a few places 2004-12-06 08:11:14 +00:00
Daniel Borca
d033ce63da disable junk for mingw 2004-12-06 08:10:33 +00:00
Daniel Borca
ac7091078f small fix for debug paths 2004-12-06 08:10:01 +00:00
Daniel Borca
fa9ab2d052 sync with glut/glx 2004-12-06 08:09:22 +00:00
Brian Paul
ddfd2067ae report bugs at freedesktop.org 2004-12-05 18:03:21 +00:00
Brian Paul
86cbfc2fac direct bug reports to freedesktop.org 2004-12-05 18:02:01 +00:00
Ian Romanick
74764061fa Move common GLX code to glX_XML.py. This will make adding glX_proto_recv.py
easier later on.
2004-12-03 20:31:59 +00:00
Ian Romanick
47719fda0c Fix a minor bug in glXEnumFunction::PrintUsingTable. Add some comments.
Add the (currently unused) utility funciton glXFunction::opcode_real_value.
2004-12-03 20:24:50 +00:00
Brian Paul
cbc527cd17 mask color indexes against palette size, per the spec 2004-12-03 18:12:08 +00:00
Roland Scheidegger
0fdb7ef877 only enable GL_MESA_ycbcr_texture for real r200 chips, not the derivatives, since yuv textures do not work for some reason on the other chips. 2004-12-03 18:09:40 +00:00
Roland Scheidegger
de7b071b55 enable GL_EXT_stencil_wrap (patch from idr), including some hacks for original radeons which have some broken stencil ops. 2004-12-03 17:26:41 +00:00
Brian Paul
25b67e6404 Use the GL datatypes. Lots of assorted clean-ups. 2004-12-03 15:58:07 +00:00
Brian Paul
404055216d silence warning 2004-12-03 15:39:58 +00:00
Brian Paul
2d846b712c re-disable TRACE 2004-12-03 15:39:08 +00:00
Brian Paul
a760ccf6d8 silence a variety of warnings found with g++ 3.4.2 2004-12-03 15:24:34 +00:00
Alan Hourihane
025aa9efcd silence warnings 2004-12-02 14:50:13 +00:00
Alan Hourihane
8694285053 reverse some debug that slipped through 2004-12-02 13:32:55 +00:00
Alan Hourihane
22ae633d1e Fix some warnings 2004-12-02 13:29:40 +00:00
Ian Romanick
ba807fbe29 Updated the schema. Added comments explaining some of the non-obvious
attributes.  Modified a couple handcode functions to use the count_scale
attribute instead.
2004-12-02 00:01:12 +00:00
Ian Romanick
00d153eb72 Corrected a problem with the sizes of the MAP[12]_* enums. 2004-12-01 23:53:43 +00:00
Ian Romanick
5ee2f9aed4 Added a couple missing always_array annotations and a couple trival
enum-only extensions.
2004-12-01 21:25:52 +00:00
Ian Romanick
596ccff699 Prevent possible divide-by-zero error. 2004-12-01 20:20:13 +00:00
Ian Romanick
77e297c368 Refactor ExtractDir and OpenDriver to be a bit more clear. 2004-12-01 09:41:14 +00:00
Ian Romanick
9bba1cfc39 Use indirect_size.c and indirect_size.h generated by using
src/mesa/glapi/glX_proto_send.py with the '-m size_c' and '-m size_h'
options.
2004-12-01 09:11:04 +00:00
Ian Romanick
b53df18624 Slightly tweak the format of the size prototypes. 2004-12-01 09:06:34 +00:00
Ian Romanick
548435215d Use the indirect_init.c generate by using src/mesa/glapi/glX_proto_send.py
with the '-m init_c' option.
2004-12-01 08:49:41 +00:00
Ian Romanick
4f4854a4af Make the transition to script-genereated GLX code easier.
Convert GL 1.4 function names to EXT_blend_func_separate names.
2004-12-01 08:47:35 +00:00
Ian Romanick
529381ff75 Make the transition to script-genereated GLX code easier.
Convert GL 1.4 / ARB_point_parameter function names to EXT_point_parameter /
NV_point_sprite names.
2004-12-01 08:42:31 +00:00
Ian Romanick
e9789cf071 Python script to generate various bits of client-side GLX protocol code. 2004-12-01 08:35:37 +00:00
Ian Romanick
6b89a8363b Make the transition to script-genereated GLX code easier.
Move "handcoded" ARB_window_pos / MESA_window_pos functions to their own
file.  Modify the ARB_window_pos functions to use the MESA_window_pos names.
2004-12-01 08:31:15 +00:00
Ian Romanick
bb427b10b1 Make the transition to script-genereated GLX code easier.
Move "handcoded" ARB_transpose_matrix functions to their own file.  From
here on out, such handcoded functions should go in a file named
indirect_FOO.c, where "FOO" is some logical name for the functionality
(e.g., part of the extension name, etc.).
2004-12-01 08:22:44 +00:00
Ian Romanick
c8c24d049d Make the transition to script-genereated GLX code easier.
Move EXT_vertex_array wrapper functions from indirect_init.c to vertarr.c.
Fix problems with EXT_multi_draw_arrays function names.
2004-12-01 08:15:01 +00:00
Ian Romanick
345ed3ac8c Make the transition to script-genereated GLX code easier.
Eliminate the need for indirect_wrap.h and NEED_GL_FUNCS_WRAPPED.
Basically, this means prepending __indirect_ to all the definitions and
calls of GL functions that don't already have it.
2004-12-01 08:02:50 +00:00
Ian Romanick
249a5552f1 Make the transition to script-genereated GLX code easier.
Convert GL_ARB_texture_compression related functions to use the extension
version of the names instead of the GL 1.3 versions.
2004-12-01 07:34:25 +00:00
Ian Romanick
4f0a75e724 Added the ability to get the size of a parameter as a string. Changed the
meaning of "variable length array" to include variables that are "counted"
instead of just ones that use an enum to map to a count.  Added glParameter
to the glItemFactory.
2004-12-01 00:29:48 +00:00
Ian Romanick
9001d67309 Added enums for GL_OES_read_format. 2004-12-01 00:25:46 +00:00
Ian Romanick
fc43857cc9 Add trivial support ARB_texture_rectangle and OES_read_format. 2004-12-01 00:20:22 +00:00
Ian Romanick
05f4a2b92d Missed GL_OES_read_format_bit in last commit. 2004-12-01 00:18:01 +00:00
Ian Romanick
f1f18cd1b8 Since we know the problem with HP_occlusion_test is / was on the server-side,
re-enable the extension on the client-side.
2004-11-30 23:29:51 +00:00
Ian Romanick
6106502fdf PrioritizeTextures, GetClipPlane, and WindowPos3fMESA don't need to be
handcoded, but Enable and Disable do.  Corrected some minor problems in the
PixelMap functions and some ARB_vertex_program functions.  Added size data
for the enums that can be passed to the Map[12][fd] functions.  Added the
enums for EXT_pixel_buffer_objects.
2004-11-30 23:27:33 +00:00
Keith Whitwell
4f144b6087 EXT_422_pixels test 2004-11-30 19:15:06 +00:00
Brian Paul
bf4c23d00f no need to include stddef.h anymore 2004-11-29 17:31:03 +00:00
Brian Paul
dc991a2085 silence a warning 2004-11-29 17:30:21 +00:00
Brian Paul
55656a53d4 added __glXFindDRIScreen to glXGetProcAddress (bug 1068879) 2004-11-29 17:26:19 +00:00
Brian Paul
0d5e6ccfd6 fixed OSF/1 shared lib problem (bug 1065260) 2004-11-29 17:23:12 +00:00
Brian Paul
e25c7c2ad5 update from Jouk 2004-11-29 14:41:46 +00:00
Brian Paul
9cf65c5a5b fix missing width/height error 2004-11-28 18:07:33 +00:00
Brian Paul
65a66f5bc3 Remove _mesa_ResizeBuffersMESA() call from _mesa_set_viewport().
Now, the driver's Viewport routine should call _mesa_ResizeBuffersMESA()
if necessary.
Cleaned up code related to GLframebuffer width/height initialization.
Set initial viewport/scissor params in _mesa_make_current2(), instead of
in the drivers' MakeCurrent functions.
2004-11-27 22:47:59 +00:00
Brian Paul
118a8bad73 new comments and assertions 2004-11-27 22:44:35 +00:00
Brian Paul
29926a11b1 Remove the redundant width, height fields in xmesa_buffer struct. Just use
the values in the contained GLframebuffer.
Removed some other unneeded code.
2004-11-27 21:20:37 +00:00
Brian Paul
b371e50d6d remove _glapi_add_entrypoint() calls, they're already in context.c 2004-11-27 20:21:25 +00:00
Brian Paul
de43484c73 add a few functions in add_newer_entrypoints() 2004-11-27 20:14:03 +00:00
Brian Paul
b5b8d22c4e Change the dispatch offsets for the VertexAttrib*NV functions so they don't
alias with the corresponding ARB functions.
GL_ARB_vertex_shader (and OpenGL 2.0's) VertexAttrib functions don't alias
with conventional vertex attributes, as GL_NV_vertex_program does.
So, the ARB and NV version of VertexAttrib need to be distinct.
2004-11-27 20:07:08 +00:00
Brian Paul
0699b0bb17 silence warnings 2004-11-27 19:57:46 +00:00
Brian Paul
6bca16b877 misc updates 2004-11-27 19:42:16 +00:00
Brian Paul
91d09a9ffa Set symbol visibility to 'default', if supported by gcc. 2004-11-27 17:32:03 +00:00
Brian Paul
819b519534 use new PUBLIC macro for symbol export 2004-11-27 17:30:41 +00:00
Brian Paul
3903c1f2bc don't need glut_fbc.c 2004-11-27 16:57:06 +00:00
Brian Paul
1d97c277e0 new GetOverlayInfo() function to reduce code and silence warnings 2004-11-27 16:49:52 +00:00
Brian Paul
4d880987d2 Have OSMesaGetProcAddress() return new OSMESAproc typedef. 2004-11-27 16:24:39 +00:00
Brian Paul
21f6978c53 clean up code related to dispatch table initialization 2004-11-27 05:05:32 +00:00
Brian Paul
13435525c4 clean up 'depend' commands 2004-11-27 04:58:39 +00:00
Brian Paul
2dd5b9edaa typedef GLUTproc, return it from glutGetProcAddress() 2004-11-27 04:54:48 +00:00
Brian Paul
59fcd54f29 remove -Wmissing-prototypes from g++ flags, per gcc 3.4 2004-11-27 04:50:34 +00:00
Brian Paul
11a0a99d1b use @ to silence some unneeded output 2004-11-27 04:37:25 +00:00
Brian Paul
209bd3a5b4 make get_static_proc_address() return a _glapi_proc 2004-11-27 04:02:32 +00:00
Brian Paul
7ee79c80ea use _glapi_proc 2004-11-27 03:51:25 +00:00
Brian Paul
767e15a78a Use new _glapi_proc typedef instead of void * for function pointers.
Misc clean-ups in glapi.c
2004-11-27 03:51:11 +00:00
Brian Paul
1136412013 fix typo, update version/date 2004-11-27 03:47:14 +00:00
Brian Paul
911a8bc62c remove the GLAPI/GLAPIENTRY defines - they're already in gl.h 2004-11-27 03:29:39 +00:00
Brian Paul
39c86eac9b removed a bunch of #define cruft, in case anyone still uses this code 2004-11-27 03:21:43 +00:00
Brian Paul
568f7578d3 Removed GLCALLBACK stuff - apparently never used anywhere.
Removed GLWINAPI stuff - only used (unnecessarily?) in enums.c
2004-11-27 03:14:57 +00:00
Brian Paul
d2c1027d40 added X11 and OSMESA source to ALL_SOURCES, updated etags command 2004-11-26 16:23:22 +00:00
Brian Paul
4fe34f340c (GLint*) casts in glGetIntegerv calls 2004-11-26 13:43:17 +00:00
Brian Paul
59651a076d update some type names 2004-11-26 13:34:45 +00:00
Brian Paul
c5f9aa7750 Use a generic function typedef instead of void * to avoid gcc 3.4 warnings. 2004-11-25 23:26:16 +00:00
Brian Paul
be2de8b299 Use __GLXextFuncPtr type instead of void * for generic functions to
avoid gcc 3.4 compiler warnings.
Remove the unused/obsolete GLX_render_texture stuff.
2004-11-25 23:25:33 +00:00
Brian Paul
4dafbc3dc7 Some new comments, clean-up formatting, etc. 2004-11-25 23:23:40 +00:00
Brian Paul
936028f8b0 Started some assorted clean-ups in #defines, typedefs, etc.
Next: move all the Windows/WGL stuff into the drivers/windows/ directory.
2004-11-25 23:22:56 +00:00
Brian Paul
b653aaede5 minor APIENTRY clean-ups 2004-11-25 23:20:07 +00:00
Keith Whitwell
7a293a9962 Update expected DRM version to 2.0.0 2004-11-25 14:05:05 +00:00
Ian Romanick
6dbb8ead0f Added support for several additional enum-only extensions:
ARB_texture_rectangle, EXT_texture_env_dot3, EXT_texture_mirror_clamp,
ATI_texture_mirror_once, IBM_texture_mirrored_repeat,
NV_packed_depth_stencil, and NV_texture_rectangle.
2004-11-24 18:55:45 +00:00
Ian Romanick
e0a1cd3112 Added information about numerous enums to aid the development of automatic
code generation for GLX protocol.  This includes adding support for several
additional enum-only extensions: EXT_filter_anisotropic, NV_expand_normal
NV_fog_distance, NV_texture_env_combine4, SGIS_generate_mipmap,
SGIX_clipmap, SGIX_depth_texture, SGIX_fog_offset, SGIX_shadow,
SGIX_shadow_ambient, SGIX_texture_coordinate_clamp, SGIX_texture_lod_bias,
and SGIX_texture_scale_bias.
2004-11-24 18:13:43 +00:00
Brian Paul
6b6c96bdeb update _mesa_store_teximageXd() comments and minor code clean-up 2004-11-23 23:29:42 +00:00
Roland Scheidegger
ba62741261 revert enabling of hw quads for swtcl. It lead to problems with quad_strips, since they'll get reduced to quads sometimes if hw quads are enabled. But this needs more thought, since it looks like clipped primitives will always be emitted as polys, so the reduced primitives for triangles, quads, quads_strips, polys all need to be the same, otherwise get lockups with for instance the olympic test. Render templates would probably need to be changed for this to work. 2004-11-23 18:49:18 +00:00
Ian Romanick
180b0db344 Set the "ignore" flag for any functions that the open-source libGL doesn't
already support GLX protocol for.
2004-11-23 00:19:51 +00:00
Brian Paul
a789252feb Don't allow queries/etc of buffer object 0 - it's invisible to users.
Misc clean-ups.
2004-11-22 20:01:25 +00:00
Brian Paul
ebe8d3152d added GL_RED/GREEN/BLUE to is_color_format() 2004-11-22 19:58:59 +00:00
Brian Paul
d0a82a652d silence warning, minor clean-up 2004-11-22 19:39:16 +00:00
Brian Paul
c247c7f66f applied SPARC patch (freedesktop bug 1898) 2004-11-22 19:27:40 +00:00
Brian Paul
263317d00a include <X11/Xthreads.h> instead of "Xthreads.h" 2004-11-22 19:11:01 +00:00
Brian Paul
65b79057b9 misc updates 2004-11-22 17:49:15 +00:00
Daniel Borca
f76be3d6f2 handle ENABLE_BIT for EXT_stencil_two_side 2004-11-22 08:46:53 +00:00
Brian Paul
4b4e7a982a fix APP_LIB_DEPS (bug 1065260) 2004-11-15 16:54:14 +00:00
Adam Jackson
ad919c30df Sync with Xorg head: mingw build fixes from Alexander Gottwald. 2004-11-15 15:31:32 +00:00
Daniel Borca
c0be56e5e8 moved windoze specific code outside drivers/glide/ 2004-11-15 10:54:57 +00:00
Daniel Borca
4ffc5fa7a5 work around a bug in gcc 3.3.3 (which duplicates ASM block) 2004-11-15 08:06:55 +00:00
Daniel Borca
fdd74136b3 fix _mesa_image_address2d invocation 2004-11-15 08:05:59 +00:00
Daniel Borca
37918cf3d9 use float constants 2004-11-15 08:04:33 +00:00
Daniel Borca
fd9b30750a use parentheses to avoid warning 2004-11-15 08:03:22 +00:00
Daniel Borca
16e6f05772 the win32 interface will be moving under windows/ 2004-11-15 08:02:24 +00:00
Daniel Borca
05cb9468f3 emphasize on the contents of Glide SDK 2004-11-15 08:01:20 +00:00
Roland Scheidegger
e6cd5d675f enable hw quad primitive for swtcl 2004-11-12 18:34:35 +00:00
Roland Scheidegger
ce055c26f0 add LOCK_HARDWARE/UNLOCK_HARDWARE to radeonClear so state gets updated which hopefully fixes lockups (?) (from r200 driver) 2004-11-12 18:29:51 +00:00
Roland Scheidegger
8e39265752 (from r200 driver) If an application cleared before any state had been emitted, that clear would
happen before any state had been set, causing a hang later on.  Fix this by
calling radeonFlush instead of FIREVERTICES (which checks if any state has been
emitted but not flushed, before calling Flush) in radeonClear.  While here, add
some more debugging info which was useful, and remove an unnecessary
save/restore in BackUpAndEmit.
2004-11-12 18:27:14 +00:00
Roland Scheidegger
6cf002c0c2 fix quads to use GL_QUADS instead of GL_TRIANGLES as primitive 2004-11-12 18:00:44 +00:00
Daniel Borca
8d88f826b9 small note regarding SSE under pure DOS 2004-11-12 15:00:30 +00:00
Daniel Borca
0676fc357a added a few sanity checks
made coding style a bit more consistent
2004-11-12 14:58:26 +00:00
Daniel Borca
885f10706a added DD_TRI_TWOSTENCIL to ease EXT_stencil_two_side in device drivers 2004-11-12 10:23:10 +00:00
Daniel Borca
f37383c1c6 wip hack for EXT_stencil_two_side 2004-11-12 10:11:04 +00:00
Daniel Borca
79a98dea91 pop(stencil) for EXT_stencil_two_side 2004-11-12 09:56:33 +00:00
Adam Jackson
a2c2393d91 brown paper bag, r100 can't do hardware quads. 2004-11-12 04:20:15 +00:00
Adam Jackson
4d17d00bfc make render_quads_verts call EMIT_PRIM with the arguments in the right order,
and enable hardware quads on r200 and radeon.  samples/prim renders quads
correctly now.
2004-11-12 04:13:27 +00:00
Brian Paul
b271ce8eda allow specifying image file on command line 2004-11-10 23:16:22 +00:00
Brian Paul
60909388ab GL_(UN)PACK_SKIP_IMAGES should only be applied to 3D texture pack/unpacking
and ignored for 1D and 2D images.
Need to pass in image dimensions (1,2,3) to the _mesa_image_address() function.
This change gets propogated to some other routines.
Also added new _mesa_image_address[123]d() convenience functions.
2004-11-10 15:46:52 +00:00
Brian Paul
f00d7edd74 added shaderobjects.c 2004-11-10 15:25:37 +00:00
Roland Scheidegger
de08b0d7ed add some chip ids 2004-11-10 01:49:01 +00:00
Brian Paul
b12594d2a0 do clipping prior to XGetImage, just in case the image would extend beyond the screen's bounds 2004-11-09 01:20:57 +00:00
Brian Paul
2a10ad16a6 use the new _mesa_clip_readpixels() routine 2004-11-09 01:10:36 +00:00
Brian Paul
e677da9e54 added a comment and assertion in _mesa_clip_drawpixels() for PixelZoom 2004-11-09 01:08:04 +00:00
Brian Paul
c55c963f4c Removed _swrast_clip_pixelrect(). Use _mesa_clip_drawpixels() instead. 2004-11-09 01:04:50 +00:00
Brian Paul
4084e3c215 added _mesa_clip_drawpixels() and _mesa_clip_readpixels() 2004-11-09 01:03:49 +00:00
Brian Paul
4f28c9c35a don't use ctx->Pack, use the function argument 2004-11-09 00:55:13 +00:00
Brian Paul
83889ffd97 Remove need for defining _MSC_VER when building Mesa for windows with
a non MS C compiler (MinGW).  (Gregor Anich)
2004-11-08 15:08:48 +00:00
Brian Paul
5849e3d353 shorter error messages when calling a GL function without a bound context (FDO bug 1775) 2004-11-05 18:32:02 +00:00
Ian Romanick
cb7f212f93 Add EXT_stencil_wrap test that doesn't depend on stencil read-back
functioning.
2004-11-04 22:32:41 +00:00
Adam Jackson
473fe6d6bf constify a few arrays. 2004-11-03 18:55:31 +00:00
Adam Jackson
5dd18e95d9 static char * -> static char [] 2004-11-03 18:55:20 +00:00
Roland Scheidegger
d294f79190 enable GL_EXT_fog_coord. Calculate fog factors and submit them instead of fog coords (it seems the chip cannot do fog factor computation when not using fragment depth as fog coord source). vtxfmt uses fallback for now (most code present but some magic would be needed if replaying vertices is necessary later on). 2004-11-03 17:29:39 +00:00
Ian Romanick
bdd53efe83 Added MMX optimized version of the RGB565 ReadRGBASpan routine. 2004-11-02 18:25:45 +00:00
Nicolai Haehnle
2302cc1a25 No visible changes, but commit the groundwork for further experiments:
- Install custom (though inactive) pipeline
- Track depth test and culling state in hardware registers
2004-11-02 13:06:45 +00:00
Nicolai Haehnle
b187341e63 Add culling registers, sync versions of r300_reg.h 2004-11-02 13:05:40 +00:00
Brian Paul
b17a1a1826 merge the AIX and AIX64 cases 2004-11-01 22:28:42 +00:00
Keith Whitwell
cc78e40172 Nicolai's sw-clipspan-fixes.patch 2004-11-01 20:27:43 +00:00
Daniel Borca
3d2b4bfa95 cleaned up the mess a bit 2004-11-01 09:06:17 +00:00
Daniel Borca
95e2a8099b small aesthetic correction 2004-11-01 08:49:55 +00:00
Daniel Borca
e14119f143 updated "clean" target in makefiles 2004-11-01 08:40:03 +00:00
Daniel Borca
63a2f2a977 protected against old djgpp distros 2004-11-01 08:38:12 +00:00
Daniel Borca
3c17d73c87 fixed compilation error 2004-11-01 07:40:53 +00:00
Brian Paul
051cf9df6a fix convolution regression from revision 1.48 to 1.49 2004-11-01 01:00:16 +00:00
Brian Paul
a6c21a2af1 don't advertise GL_ARB_vertex/fragment_shader until they're done 2004-10-31 18:55:00 +00:00
Brian Paul
a196565e04 added a cast to ADD_POINTERS macro 2004-10-31 18:54:10 +00:00
Brian Paul
aea02adc7b remove PBO work from to-do list 2004-10-31 18:44:24 +00:00
Brian Paul
753476c162 finished up PBO support 2004-10-31 18:43:46 +00:00
Brian Paul
effb720882 indentation fix 2004-10-31 18:41:38 +00:00
Brian Paul
450e917c9d Use the _mesa_scale_and_bias_rgba() function in the convolution functions.
Minor clean-ups.
2004-10-31 18:40:55 +00:00
Brian Paul
331cc1dcba PBO support for gl[Get]PixelMap functions 2004-10-31 18:31:07 +00:00
Brian Paul
66f3231322 PBO support for glColorTable, glColorSubTable, glGetColorTable, etc. 2004-10-31 17:56:28 +00:00
Brian Paul
bd3b40ad75 PBO support for glConvolutionFilter1D/2D, glGetConvolutionFilter, etc. 2004-10-31 17:36:23 +00:00
Brian Paul
d56928f10d updated for PBOs 2004-10-31 17:04:07 +00:00
Brian Paul
b6f97582dd glPolygonStipple() and glGetPolygonStipple() updated for PBOs. 2004-10-31 16:52:48 +00:00
Brian Paul
1c86813922 PBO support for glGetCompressedTexImage(). 2004-10-31 16:35:06 +00:00
Brian Paul
b46712ca9d glGetTexImage() now works with PBOs. 2004-10-31 16:24:32 +00:00
Brian Paul
c0ebc4931a Map/Unmap PBO as needed so that the texstore routines can work with
hardware-based PBOs in the future.
2004-10-31 16:18:07 +00:00
Brian Paul
ba164c4614 Removed _swrast_validate_pbo_access().
In x11 driver, map/unmap PBO as needed in DrawPixels functions.
2004-10-31 15:49:59 +00:00
Brian Paul
355467bed8 Allow the software fallback glDrawPixels, glReadPixels, glBitmap commands to
work with real, hardware-based PBOs in the future by mapping/unmapping the
PBO buffer as needed.
2004-10-31 15:39:04 +00:00
Brian Paul
c6136ea62c unbind GL_PIXEL_UNPACK_BUFFER_EXT before calling glBitmap! 2004-10-31 15:27:12 +00:00
Brian Paul
7eab337d9c use _mesa_unmap_buffer by default 2004-10-31 15:23:42 +00:00
Brian Paul
2daa4137b6 Remove redundant error checking.
Added _mesa_buffer_unmap().
Minor clean-ups.
2004-10-31 00:17:42 +00:00
Brian Paul
9ae96a5ce8 remove debug code 2004-10-29 19:31:52 +00:00
Brian Paul
7520e25995 Updated getprocaddress test to use gl_API.xml instead of old APIspec file. 2004-10-29 19:12:08 +00:00
Michal Krol
efb8b3e251 slang syntax conforming spec rev. 1.10.59 2004-10-29 17:09:40 +00:00
Daniel Borca
b0996b19f0 make sure we don't generate random alpha 2004-10-29 13:35:56 +00:00
Daniel Borca
03501e7a29 decoder "width" parameter represents "stride-in-pixels" 2004-10-29 13:25:44 +00:00
Brian Paul
7faf519233 VertexAttrib3svNV was incorrect 2004-10-29 04:00:50 +00:00
Adam Jackson
0b8acd90b3 libGL needs libXxf86vm.a. 2004-10-29 00:10:43 +00:00
Brian Paul
4e120c9718 obsolete 2004-10-28 22:18:52 +00:00
Brian Paul
98fa2bf364 minor clean-ups, found with pychecker 2004-10-28 21:11:02 +00:00
Brian Paul
fa557e904d name parameter to glGetActiveAttribARB() should not be const.
Added shaderobjects.c to sources file.
2004-10-28 21:03:19 +00:00
Michal Krol
af7a807650 renumber ARB_shader_objects and ARB_vertex_shader offsets
to get BlendEquation have offset 710
fix param name lack with GetInfoLogARB
2004-10-28 11:14:02 +00:00
Eric Anholt
cc182213c8 Add FreeBSD DRI build targets. Doesn't build at the moment, due to the same
problems as Linux.
2004-10-28 00:19:21 +00:00
Eric Anholt
948f2720f7 Use the generic __amd64__, instead of __AMD64__ which has to be defined by hand. 2004-10-28 00:18:02 +00:00
Brian Paul
51c026b265 updated PLIB URL 2004-10-27 23:01:47 +00:00
Adam Jackson
3291de6d06 Bug #1713: Some rare libGL's have __glXFindDRIScreen defined but do not
export it via glXGetProcAddress.  These are not supported anymore, so print
an error message to that effect.
2004-10-27 17:50:09 +00:00
Michal Krol
b28031d57e remove unused entries 2004-10-27 17:36:23 +00:00
Michal Krol
80d468c1c9 fill api entries for ARB_shader_objects and ARB_vertex_shader 2004-10-27 17:34:27 +00:00
Michal Krol
678ea6cd5c add entries for extensions ARB_shader_objects, ARB_fragment_shader and
ARB_vertex_shader
2004-10-27 17:27:57 +00:00
Michal Krol
2f11cbd15b add FEATURE flags for ARB_shader_objects, ARB_vertex_shader and
ARB_fragment_shader
2004-10-27 17:16:06 +00:00
Michal Krol
c1fe469870 by karoshi - ARB_shader_objects implementation
empty routines by now
2004-10-27 17:09:10 +00:00
Michal Krol
ed2c18c08c by karoshi - header file for ARB_shader_objects implementation 2004-10-27 16:57:04 +00:00
Michal Krol
26bf36ce49 add support for ARB_shader_objects and ARB_vertex_shader 2004-10-27 16:46:26 +00:00
Michal Krol
beb9554273 add support for ARB_shader_objects and ARB_vertex_shader 2004-10-27 16:39:09 +00:00
Michal Krol
a97bc422d6 assign api offsets for ARB_shader_objects and ARB_vertex_shader 2004-10-27 16:37:24 +00:00
Michal Krol
71eb0a7fd6 regenerate with correct script 2004-10-27 15:40:46 +00:00
Michal Krol
b7293dc2b7 regenerate with correct script 2004-10-27 15:34:31 +00:00
Michal Krol
ec3ad66696 fix DrawBufferARB entry 2004-10-27 15:29:05 +00:00
Michal Krol
1c0f9d71bd fix DrawBuffersARB entry 2004-10-27 15:27:08 +00:00
Michal Krol
455c8177ad the file was empty! 2004-10-27 15:20:08 +00:00
Michal Krol
b15fd4ba76 by karoshi - add support for ARB_shader objects and ARB_vertex_shader 2004-10-27 15:06:18 +00:00
Ian Romanick
95ba352497 As per suggestions my Michel Daenzer, improve the fix for bugzilla #1513. 2004-10-26 19:20:40 +00:00
Brian Paul
640492aec9 added an attention-getting comment for developers who get stopped in _mesa_test_os_sse_support() while debugging 2004-10-26 17:29:59 +00:00
Brian Paul
2083131643 added stereo option (Jacek Rosik) 2004-10-26 14:36:32 +00:00
Adam Jackson
1cda832fd9 remove a -Werror from testing. 2004-10-25 22:19:43 +00:00
Adam Jackson
61702d4afe Add glx/x11 to the DRI configs, and change the Solo configs to build glx/mini. 2004-10-25 21:23:08 +00:00
Adam Jackson
312c68fab3 Add DRI_LIB_DEPS for the DRI drivers to link against. Remove expat from the
link list for libGL itself under DRI configurations, since the XML parsing
code is in the drivers themselves.
2004-10-25 21:20:29 +00:00
Adam Jackson
7badefa6c4 Bug #1679: Link DRI drivers against DRI_LIB_DEPS, not GL_LIB_DEPS. 2004-10-25 21:18:52 +00:00
Adam Jackson
cb3610e37c Import the GLX client side library, formerly from xc/lib/GL/glx. Build it
by adding 'glx/x11' to SRC_DIRS in your build config.
2004-10-25 21:09:16 +00:00
Adam Jackson
bcd8735546 Import sarea.h from Xorg, needed for client GLX code. 2004-10-25 20:52:11 +00:00
Nicolai Haehnle
5a9fd2afc6 Implement ColorMask 2004-10-24 06:17:20 +00:00
Nicolai Haehnle
d586540eaf Hardware accelerated depth clear 2004-10-24 05:52:10 +00:00
Adam Jackson
94987beb2c Bug #1682: Mesa core code that gets linked into DRI drivers should never call
through the GL API directly, but should instead use the GL_CALL macro.
2004-10-24 02:05:40 +00:00
Brian Paul
07553c58fd wrap angle value (Philipp Klaus Krause) 2004-10-23 18:55:48 +00:00
Brian Paul
e57b6d5a4f addes osdemo32 target (J.P. Delport) 2004-10-23 16:58:32 +00:00
Brian Paul
0aa0343fb0 minor fixes from J.P. Delport 2004-10-23 16:57:44 +00:00
Ian Romanick
74b0080086 Big-endian fixes for R200 sw TCL path. 2004-10-23 00:42:17 +00:00
Michal Krol
cb499595aa - add decimal literal integer support
- fix bug with c-style comment closing - sequences
  like /***/ were not correctly parsed
2004-10-22 12:42:37 +00:00
Michal Krol
c69ceaf8eb forgot about revision increment 2004-10-21 14:11:06 +00:00
Michal Krol
b80bc055bc - use new program option values from arbprogram.syn
- remove redundant check of parsed program target
- remove redundant check of relative addressing range
- use faster grammar interface
2004-10-21 14:09:54 +00:00
Michal Krol
ed60e19d8a remove redundant check of parsed program target 2004-10-21 14:06:18 +00:00
Michal Krol
718ba9773b change program options numbering to accommodate future
options (up to 256)
2004-10-21 13:57:24 +00:00
Michal Krol
cbef98c2ea add new grammar_check_fast entry for faster parsing 2004-10-20 15:19:58 +00:00
Michal Krol
904ef741de - speed up syntax parsing - the parser is now 4 times faster
note: to use it you must use grammar_check_fast entry
- allow decimal format for literal integers in .syn files
- raise am error if syntax has duplicate or unreferenced
  symbols
- do some little clean-up with linked-list stuff
- make macro APPEND_CHARACTER a function
- fix minor typos and bugs
2004-10-20 14:54:17 +00:00
Daniel Borca
a7855e835d fixed compilation errors 2004-10-20 11:59:28 +00:00
Daniel Borca
05517d02be fix compilation error in `convertPalette' (still have to fix the issue, though) 2004-10-19 06:35:01 +00:00
Ian Romanick
f404ff7b76 Small optimization for big-endian (e.g., PowerPC) systems. 2004-10-18 23:24:51 +00:00
Michal Krol
f459b9f9c0 conform to shader spec 1.10.59 2004-10-18 12:18:33 +00:00
Michal Krol
cfb62331bc conform to language version 1.10 rev 59
resolve TODOs
2004-10-18 09:49:25 +00:00
Daniel Borca
a0720cf104 print an error message in convertPalette before dying.
this is NOT a fix, but it'll have to wait a little...
2004-10-18 08:17:17 +00:00
Daniel Borca
c99a99b3bc small fix to match new _mesa_rescale_teximage2d 2004-10-18 08:07:26 +00:00
Daniel Borca
1cfe1e8925 changed _mesa_rescale_teximage2d to allow rescaling of padded images 2004-10-18 08:04:21 +00:00
Daniel Borca
8cd728f436 added dstRowStride to dxtCompressTexFuncExt;
good for subimages, padded images and such.
NB: intentionally, this is the last parameter, to avoid
breaking the current API! adding a new parameter
is not harmful, at worst it will be ignored, since all
platforms use a CDECL calling convention.
2004-10-18 07:54:09 +00:00
Daniel Borca
13ec04c480 use RowStride instead of Width in texel fetchers.
changed some pointers to be (char *) instead of (long)
2004-10-18 07:49:26 +00:00
Ian Romanick
b430a1ae22 Fix compile errors when DEBUG is defined. 2004-10-18 00:00:41 +00:00
Ian Romanick
48da4a4a86 Fix t_vertex byte-ordering issues for PowerPC. This was tested with gears
and tunnel (for fog).
2004-10-17 21:54:41 +00:00
Ian Romanick
40e852271b Add ARGB modes to support big-endian systems. 2004-10-17 21:53:43 +00:00
Ian Romanick
add38812f0 Fix hangs on big-endian (e.g., PowerPC) hardware. 2004-10-17 21:29:58 +00:00
Nicolai Haehnle
ff42a00402 - FIX: flickering
- Scissor support works now
2004-10-17 20:26:06 +00:00
Brian Paul
158a251a6b added initial support for -exports option, Linux/OpenBSD only for now 2004-10-16 15:10:45 +00:00
Brian Paul
901d9b9a92 GL_OES_read_format info 2004-10-16 15:04:43 +00:00
Brian Paul
c498742768 if CXX or CC env vars aren't set, use g++, gcc by default (Linux) 2004-10-16 15:02:16 +00:00
Ville Syrjala
3152b1586c Removed two unnecessary variables. 2004-10-16 11:26:06 +00:00
Ville Syrjala
63e9a968ff Fixed off by one errors in clipping. 2004-10-16 11:09:26 +00:00
Eric Anholt
b1ebd306bf Add code to support projective texturing and fix mixed enabling of texture
coordinate generation.  Original code by Roland Schiedegger, with changes by
myself.  While here, ensure that the swtcl path does tnl_install_attrs enough
when fog/specular are being (en/dis)abled.

Notable effects:
- projtex test works with TCL and is closer with swtcl (Bugzilla #1461)
- 8/9 squares work in texgenmix instead of 3.
- texcyl "reflect" mode works (GL_SPHERE_MAP is now a fallback -- unclear if the
  hardware can actually support it).
- flickering in doom3 replaced by just plain darkness.
- blocktube fixed (Bugzilla #984)
- fixes stex3d
2004-10-16 03:36:14 +00:00
Eric Anholt
a1af92877d Always turn on the TAM_DEBUG3=0x6 workaround on real r200s. It appears that
the current cases for turning it on were insufficient (Bugzilla #1519, 729, 814)
and it has no significant performance impact.  Performance tested with quake3
in GL_LINEAR mode both with and without anisotropy, with the workaround always
on or always off.
2004-10-16 01:58:02 +00:00
Ian Romanick
33899b7c35 Add support for OES_read_format. As soon as glext.h is updated with the
enums for this extension, the changes to gl.h can be removed.
2004-10-16 01:16:54 +00:00
Brian Paul
83c74b7279 fix if/else bug in _mesa_ProgramEnvParameter4fARB (fdo bug 1645) 2004-10-16 00:29:03 +00:00
Ian Romanick
1aa37f97c4 Only build the MMX/SSE/SSE2 versions for ReadRGBASpan when the pixel format
matches what they optimized versions actually expect.
2004-10-16 00:03:27 +00:00
Ian Romanick
12b53f2079 Fixed a few places that should have been using GET_SRC_PTR. 2004-10-15 23:46:53 +00:00
Ian Romanick
ea6786b453 Convert MGA driver to use new spantmp2.h interface. 2004-10-15 23:00:52 +00:00
Nicolai Haehnle
5696710f96 Huge dumb drop. State:
- Color buffer clear is accelerated, but flickers (possibly caused by a
  recent DDX or Mesa change or bad merge)
- Everything else uses software fallback rendering
- There should be no clipping-related artifacts with the
  sw-clipspan-fixes.patch against Mesa (posted on dri-devel)
- Multiple clients should be rock solid with a DDX patch that is soon to
  come (soon = within the next hour or so)
2004-10-15 20:52:47 +00:00
Ian Romanick
0648794518 Add support for optimized versions of the code underlying ReadPixels
(and DrawPixels).  The R200, R128, and Unichrome drivers get support
in this commit.  Other drivers would be easy enough to add for people
that have the cards.

The DRI (CVS) build will need to be updated to account for the new
source files.
2004-10-14 00:59:12 +00:00
Keith Whitwell
dc45ee7a4b Add a license to this file. It was written on VA's watch, so they get
the honours.
2004-10-13 23:16:02 +00:00
Ian Romanick
07bd4c585c Added some documentation that I managed to figure out through
experimentation.
2004-10-13 22:38:31 +00:00
Ian Romanick
82f2e80f14 Make the GL_RENDERER string include the actual chipset information
instead of always saying "CLE266".
2004-10-13 22:36:26 +00:00
Ian Romanick
447cdd536f Initial support for PowerPC specific code in Mesa and DRI drivers. DRI
drivers built on PowerPC systems should now show things like "PowerPC" or
"PowerPC/Altivec" in the GL_RENDERER string.

The VMX moniker is used for Altivec/Velocity Engine/VMX SIMD additions.  I
chose this not because I work for IBM but because it's a LOT shorter to
type. :)
2004-10-13 19:56:15 +00:00
Ian Romanick
b72ed81818 Refactor the code in driGetRendererString a bit to make it easier to
add support for features of non-x86 CPU types.
2004-10-13 19:23:26 +00:00
Brian Paul
f599716b93 updated fsv URL 2004-10-13 17:29:46 +00:00
Ian Romanick
81f67fc4e9 Eliminate the funky SSE exception test from DRI builds. It's not need
(see the comment in the code), and it's just annoying.
2004-10-13 17:29:33 +00:00
Brian Paul
612d5f6e84 initial 6.3 changes 2004-10-13 15:57:55 +00:00
Brian Paul
dfe508ca7a Fix minor fog / fragment program state bug.
Don't add diffuse and specular colors when using fragment program.
2004-10-13 15:54:48 +00:00
Adam Jackson
886df0926f Bug #1588: abort if no palette format matches. (Egbert Eich, Stefan Dirsch) 2004-10-13 14:33:49 +00:00
Philippe Houdoin
f58c61ddb5 Let's build again after the support for GL_ARB_draw_buffers was added. 2004-10-13 01:23:32 +00:00
Philippe Houdoin
d334067193 Fix a potential memory leak. 2004-10-13 01:17:52 +00:00
Philippe Houdoin
fd7f62a508 Forgot a contributor.
Update build requirements since we can build with BeOS vanilla gcc *and*
more recent gcc 2.95.3 versions (recommended for best performance).
2004-10-13 00:35:55 +00:00
Philippe Houdoin
ac855a6688 Implement BGLView::CopyPixelsIn/Out().
BGLView::ErrorCallback() is now actually called on error!
Plus usual minor changes.
2004-10-13 00:29:21 +00:00
Daniel Borca
701c289ff3 support for external libraries 2004-10-12 07:33:03 +00:00
Daniel Borca
3c9faa448c SWTC trick (disabled for now) 2004-10-12 07:32:11 +00:00
Daniel Borca
2bff8bd8de SWTC trick, enabled new extensions 2004-10-12 07:31:26 +00:00
Daniel Borca
92e1d5fd34 SWTC trick 2004-10-12 06:44:34 +00:00
Daniel Borca
65a9ca3381 bump version numbers to their real values 2004-10-12 06:43:57 +00:00
Daniel Borca
f5e7629685 doc update 2004-10-12 06:43:00 +00:00
Daniel Borca
189f7e31d6 avoid the patch if Mesa_DXTn flag is set 2004-10-12 06:42:02 +00:00
Daniel Borca
76908ab9d4 add more mess to the dynamic linking system 2004-10-12 06:41:20 +00:00
Daniel Borca
3d322f6c5e add newline to end of file 2004-10-12 06:37:18 +00:00
Felix Kuehling
def29a3f87 Fix strange white space that gcc didn't like. 2004-10-11 22:26:40 +00:00
Michal Krol
ab2c0bed5a Prefix operator and constructor keywords with two consequtive underscores
( __ ). This will be more compatible with glslang spec.
2004-10-11 15:06:02 +00:00
Michal Krol
ad22ce8143 Enable draw_buffers only if GL_ARB_draw_buffers string is
present in GL_EXTENSIONS string.
Parse OPTION ARB_draw_buffers.
2004-10-11 08:13:25 +00:00
Eric Anholt
739823d250 This statechange is vtx state, not tcl. 2004-10-09 23:29:07 +00:00
Eric Anholt
57f1b25caf Use the right FALLBACK macro for projtex so that projective textures actually
cause a fallback, and simplify the tmu handling a little.
2004-10-08 23:24:04 +00:00
Eric Anholt
ea6f4f6079 Add fallback debugging (R128_DEBUG=fall) output, and set DO_DEBUG=1 by default
so that we can use the env var to get output.  Add a no_rast driconf option to
force software fallbacks.
2004-10-08 23:03:38 +00:00
Eric Anholt
b4d269f35f Don't compile WriteMonoDepthSpan if HAVE_HW_DEPTH_SPANS is defined -- it won't
be used in that case, and it wanting WRITE_DEPTH was making r128 die on
the undefined symbol.
2004-10-08 22:21:09 +00:00
Eric Anholt
f6cdaa9c81 Add support for NV_blend_square, and print errors if an unsupported blend
function is used.
2004-10-08 21:37:08 +00:00
Ian Romanick
3eccddb746 Massively cleaned up the code that calculates front/back/depth buffer
pitch and size.  Cut out a bunch of dead code.

This fixes bugzilla #1555.
2004-10-08 01:15:52 +00:00
Ian Romanick
a2dc424acf Reject unsupported texture formats passed to glCompressedTexImage?D. This
fixes Mesa bug #1028405.
2004-10-08 01:03:10 +00:00
Ian Romanick
af0a4690db Add simple test program for Mesa bug #1028405. 2004-10-08 00:56:08 +00:00
Alex Deucher
cb1642a75c Apply Eric's stencil wrap patch (Eric Anholt) 2004-10-08 00:31:51 +00:00
Eric Anholt
d09209f553 Add Roland Scheidegger's S3TC patch. This patch does not implement the
(patented) S3TC/DXTC algorithms, but adds an option to dlopen a library module
providing functions to do so.  Because it uses dlopen, it is only enabled if
USE_EXTERNAL_DXTN_LIB=1 is defined (which is only in linux-dri config, so far).
It adds support for S3TC to several DRI drivers, and adds a DRI config option to
force enabling S3TC even if the software compression/decompression is
unavailable.  This may allow people to use apps that require S3TC even though
they don't have a license to implement the patented material themselves, if
those apps use precompressed textures.

Ideally we would get permission from the current holder of the patents to
implement the algorithm in Mesa, at which point the dlopen mess could go away.
Until then, this allows some to run applications they couldn't otherwise, and
hopefully will provide us with more push to get the final step of getting that
permission done.
2004-10-07 23:30:29 +00:00
Ian Romanick
554e5a2eaf Prevent Y-offset from exceeding valid range in texture upload code. This
fixes bugzilla #960.
2004-10-07 16:39:20 +00:00
Felix Kuehling
1695cfe991 Fix emitting fog without secondary color and vice-versa. 2004-10-07 10:07:35 +00:00
Karl Schultz
89353febc0 *** empty log message *** 2004-10-06 21:45:48 +00:00
Brian Paul
fb170c8bd7 more GL_ARB_draw_buffers updates from Michale Krol 2004-10-06 15:56:38 +00:00
Brian Paul
0b89f7a93a fix GetVertexAttrib problem 2004-10-06 15:52:43 +00:00
Ian Romanick
be50caa52c Convert tdfxDDInitExtensions to use driInitExtensions. 2004-10-06 02:02:53 +00:00
Daniel Borca
e9be96d39e put Rush in the list of supported HW 2004-10-05 08:43:22 +00:00
Daniel Borca
0efa4a8f96 stencil wrap works, either HW or SW (Ian Romanick) 2004-10-05 08:42:10 +00:00
Daniel Borca
cb932046a8 enable 2_0 extensions 2004-10-05 08:39:32 +00:00
Ian Romanick
617add69ca Use the driFillInModes utility function. 2004-10-04 22:58:39 +00:00
Ian Romanick
ee3b7e390a Also export fbconfigs with 0/0 depth/stencil modes. This fixes "driver
claims not to support visual 0xXX" warnings in X.org 6.8.1.
2004-10-04 22:23:29 +00:00
Ian Romanick
b82333db3e Add some Savage3D stencil documentation based on discussions during the
20-Sep-2004 #dri-devel meeting.
2004-10-04 17:17:49 +00:00
Brian Paul
ddfec59bcd make clean should remove depend.bak too (Sérgio Moneiro Basto) 2004-10-04 14:47:48 +00:00
Brian Paul
be76b7fe1e ARB_fp support for GL_ARB_draw_buffers (Karl Rasche) 2004-10-04 14:40:05 +00:00
Ian Romanick
00fb3a054a Set MaxTextureImageUnits and MaxTextureCoordUnits to match MaxTextureUnits.
This fixes bugzilla #1511.
2004-10-04 03:19:01 +00:00
Ian Romanick
5e243bd57e The alpha post-scale and the RGB post-scale were mistakenly reversed. 2004-10-04 02:54:49 +00:00
Eric Anholt
e8250c6271 Remove empty r128_vb.h. 2004-10-03 18:09:57 +00:00
Brian Paul
58d84409a3 put glapi_x86.S into the x86/ directory 2004-10-02 22:48:59 +00:00
Brian Paul
788ff5b5c7 remove unused413 stuff, glDrawBuffersARB uses that slot now 2004-10-02 22:47:48 +00:00
Brian Paul
feac4f6ba5 GL_ARB_draw_buffers 2004-10-02 22:43:44 +00:00
Brian Paul
3298ec4670 fix _DrawDestMask[0][0] typos 2004-10-02 22:38:43 +00:00
Brian Paul
53f82c5aad added support for GL_ARB_draw_buffers 2004-10-02 16:39:09 +00:00
Brian Paul
289ffee2a0 fix indentation 2004-10-02 15:56:50 +00:00
Brian Paul
cbef8c4776 fix a comment 2004-10-02 15:56:33 +00:00
Brian Paul
83fb8c34fb bump version to 6.3 2004-10-02 15:43:26 +00:00
Brian Paul
9cef3efc29 initial stuff for 6.3 2004-10-02 15:43:14 +00:00
Brian Paul
7e73b1afa2 a few more updates for the 6.2 release 2004-10-02 15:26:25 +00:00
Brian Paul
9ca8392484 fix LoadProgramNV regression when I had fixed the RefCount bug 2004-10-02 15:16:59 +00:00
Brian Paul
07dead7a51 added PBO known issues 2004-10-02 14:59:29 +00:00
Brian Paul
bdd3c2e44e set 6.2 release date 2004-10-02 14:56:17 +00:00
Eric Anholt
599ea624a3 If an application cleared before any state had been emitted, that clear would
happen before any state had been set, causing a hang later on.  Fix this by
calling r200Flush instead of FIREVERTICES (which checks if any state has been
emitted but not flushed, before calling Flush) in r200Clear.  While here, add
some more debugging info which was useful, and remove an unnecessary
save/restore in BackUpAndEmit.
2004-10-02 05:22:19 +00:00
Eric Anholt
e5856a2960 Convert Rage 128 over to t_vertex.c. While it's slightly slower (10% in ipers)
it's not that big of a deal in more normal apps, and axes a good bit of code.
And I assume that t_vertex will only get faster.  Removes ~43k from compiled
binary.

Tested with:	quake3, ut, ipers, texcyl, chromium, tuxracer, neverball (kinda)
2004-10-02 01:33:46 +00:00
Eric Anholt
fc552c530f Add an option for vertices emitted to be swapped CPU_TO_LE32, to be used by the
r128 code.
2004-10-02 01:28:38 +00:00
Ian Romanick
5b73371e05 Cut out all of the old texture environment code and rewrote it from
scratch.  There were just too many cut-and-paste errors in the code,
and it was too hard to follow.

This fixes Mesa bugzilla #1508.  #1509 is probably also fixed, but
I'd like to do some more testing before I close that particular bug.
Additionally, this cuts almost 4,600 lines of code from the driver.
2004-10-02 01:23:46 +00:00
Karl Schultz
7ff3c9e4fc minor updates and improvements 2004-10-01 21:22:10 +00:00
Karl Schultz
4c2fbb0538 Add the glut project to the demos workspace. 2004-10-01 20:55:23 +00:00
Karl Schultz
0303409732 Remove glut project from the Mesa workspace. This allows users to build
this entire workspace by only unzipping MesaLib.zip.  The project will
be moved to the demos workspace, which is contained in the MesaDemos zip
file.
2004-10-01 20:53:28 +00:00
Karl Schultz
786eef2b1e Add HP shared lib configs. 2004-10-01 20:19:16 +00:00
Karl Schultz
ba52e79b4e HP shared lib config 2004-10-01 20:18:42 +00:00
Ian Romanick
bf4b63f836 Replace the numerous switch-statements to derive GL_COMBINE post-scale
state with a function.  This function sets the bits correctly.  Did some
trivial refactoring on some of the GL_COMBINE code.

First pass at replacing classic texture environments with GL_COMBINE.
This is controlled by the EXPERIMENTAL_COMBINE_MODE define.
2004-10-01 18:32:25 +00:00
Karl Schultz
5e2e9ef45c fix problems in previous version 2004-10-01 16:29:39 +00:00
Karl Schultz
a16bdb5fb7 Enable builds on AIX 64-bit 2004-10-01 13:33:26 +00:00
Dave Airlie
75672d2e94 Fix mesa solo with doublebuffered apps, the drawable index/stamp weren't
being updated properly..
2004-10-01 04:34:01 +00:00
Ian Romanick
75e2f0698e Factored out code for setting texture coordinate wrap bits. Added support
for GL_ARB_texture_mirrored_repeat.  Enabled GL_NV_blend_square.  It has
always actually been supported.  Removed redundant EXT versions of ARB
extension strings.
2004-09-30 21:18:23 +00:00
Brian Paul
ba467e86fe set span.y prior to each span write in draw_depth_pixels, like Karl's other fix 2004-09-30 15:39:43 +00:00
Eric Anholt
6a2ca962db Bugzilla #1058: Fix some potential 64bit pointer issues by storing differences
between pointers in appropriate types.

Submitted by:	  Ronny V. Vindenes <s864@ii.uib.no>
2004-09-30 00:40:21 +00:00
Eric Anholt
7a086dc05e OK, one more time. Simplify the state-backup system by just storing the full
state in a ready-to-emit cmdbuf, which avoids the issue Nicolai Haehnle reported
where the check() could return differently during backup-and-emit than it should
have if it were called at the right time.  Move the lit emission before most of
the TCL state emission on r200, which fixes neverball issues.

Tested with:	r100/r200 with neverball, tuxracer, chromium, quake3, ipers
2004-09-30 00:08:05 +00:00
Karl Schultz
fa569c0a73 Fix bug in glDrawPixels when writing color indexed images on color indexed
devices.  In draw_index_pixels(), use the correct variables for the span Y
and span end values.
2004-09-28 18:53:44 +00:00
Nicolai Haehnle
f30d53e049 Initial revision 2004-09-28 10:59:23 +00:00
Daniel Borca
bbe364603c use GLuint instead of uint 2004-09-28 06:44:46 +00:00
Brian Paul
be91a0be58 version bump 2004-09-27 22:40:31 +00:00
Brian Paul
4f1e3709de change include of glx_mangle.h to match other headers 2004-09-27 22:40:22 +00:00
Brian Paul
44254d3acc remove beos/*.h files from tarball list 2004-09-27 22:38:47 +00:00
Brian Paul
c7a24118e2 bump minor version to 2 2004-09-27 22:38:25 +00:00
Brian Paul
293ad98510 VBO RefCount fix (David Reveman) 2004-09-27 16:19:17 +00:00
Daniel Borca
e60c9311da stencil wrap works, either HW or SW (Ian Romanick) 2004-09-27 07:23:20 +00:00
Eric Anholt
8018f7104b Bump driver_date for today's fixes. 2004-09-25 21:08:56 +00:00
Eric Anholt
97ac8282f5 Can't bail in sisDDLogicOpCode when logicop is off, because it's called with
GL_COPY to turn off logicop.  Fixes glean's logicop test.
2004-09-25 21:08:30 +00:00
Eric Anholt
18c459c10b Triangle stipple is a fallback, since we don't have code for the stippling.
Doesn't seem to help with glean's paths test, but I'm pretty sure it's correct.
2004-09-25 21:06:58 +00:00
Eric Anholt
5565d32b57 Correct a couple of comments. 2004-09-25 19:43:30 +00:00
Eric Anholt
7b363b0dd4 Fix SiS AGP vertex dispatch by not trying to emit 0 vertices, which would hang
the hardware.  Re-enable AGP by default.
2004-09-25 19:01:18 +00:00
Eric Anholt
d166f2bffd Add sis to the list of DRI drivers, since it had already been converted to the
new interface.
2004-09-25 16:56:58 +00:00
Eric Anholt
0a21a4aaf9 Refactor the linux-dri config files so that linux-dri-x86 inherits from
linux-dri.  Turn on -O by default (-O2 provides a slight improvement in
performance, at a large cost to debuggability).  Turn off -fPIC on x86 by
default.  Turn on -Wall, to catch more stupid mistakes.  This could be both done
cleaner, and done for more config files, but it works for me for now.
2004-09-25 07:11:12 +00:00
Eric Anholt
5562fe653c The previous code would emit a full set of state during the first EmitState on
a new cmdbuf, to ensure that state wasn't lost across UNLOCK/LOCK pairs (in the
case of context switching).  This was rather inefficient.  Instead, after
flushing a cmdbuf, mark the state as needing to be saved on unlock.  Then, at
the beginning of flushing a cmdbuf, if we actually have lost the context, go
back and emit a new cmdbuf with the full set of state, before continuing with
the cmdbuf flush.  Provides a 10-15% improvement in ipers performance in my
tests, along with other apps.

Tested with:	ipers, glxgears, quake3
2004-09-25 07:00:15 +00:00
Eric Anholt
4010481ba3 Fix texturing in quake3. Some code was left over from the dirty/clean list
setup that now removed atoms from the atomlist on texture deletion.
2004-09-25 06:12:40 +00:00
Eric Anholt
b4e2e9c65a Bump DRIVER_DATE for yesterday's changes. 2004-09-25 03:00:27 +00:00
Brian Paul
b45aaa2328 moved to demos/ directory 2004-09-24 23:01:21 +00:00
Brian Paul
7d01c3480d moved in from the tests/ directory to include in distro 2004-09-24 23:00:52 +00:00
Brian Paul
58be9e6c37 updated osmesa info 2004-09-24 20:31:02 +00:00
Brian Paul
328a039413 patches for clearing hw depth buffers from software fallback (Nicolai Haehnle) 2004-09-24 14:30:13 +00:00
Daniel Borca
d9873c59ef added (back!) option to use non-packedcolor 2004-09-24 07:03:53 +00:00
Eric Anholt
303c342d53 -O -Wall warnings cleanups in r200. 2004-09-24 04:20:58 +00:00
Eric Anholt
cddd5c99e5 Clean up some warnings in the R100 driver with -O -Wall. 2004-09-24 03:09:49 +00:00
Eric Anholt
106ab07acd Remove an unnecessary calculation of the dest pointer. 2004-09-24 01:33:15 +00:00
Brian Paul
529e0a98d4 don't test for NULL pixels pointer here, do that in the 'store' routines after validating PBO address 2004-09-23 17:34:52 +00:00
Brian Paul
1fd4a55d09 removed hacked GL tokens, fixed a printf 2004-09-23 17:32:12 +00:00
Brian Paul
7e0c5888ea added a comment in BindTexture 2004-09-23 17:31:21 +00:00
Brian Paul
7287bbf4fc just some comments and formatting changes 2004-09-23 17:30:54 +00:00
Dave Airlie
a1f8ecf962 fix for Erics new emit state code, rework out the dest pointer
after we check the buffer
2004-09-23 08:24:03 +00:00
Eric Anholt
0c8f8d3dc9 The previous code would emit a full set of state during the first EmitState on
a new cmdbuf, to ensure that state wasn't lost across UNLOCK/LOCK pairs (in the
case of context switching).  This was rather inefficient.  Instead, after
flushing a cmdbuf, mark the state as needing to be saved on UNLOCK.  Then, at
the beginning of flushing a cmdbuf, if we actually have lost the context, go
back and emit a new cmdbuf with the full set of state, before continuing with
the cmdbuf flush.  Also, remove the dirty/clean atom lists, since atoms are
emitted in a fixed order these days, and go with a simpler single list.

Provides a 14% improvement in ipers performance in my tests, along with other
apps.
2004-09-22 06:27:02 +00:00
Dave Airlie
029ee9c680 Add xmlconfig to the i810 makefile 2004-09-21 00:39:59 +00:00
Daniel Borca
e2b13e4af3 clamp size of wide points 2004-09-20 08:33:38 +00:00
Ian Romanick
c59270e2b8 Add GL_ARB_texture_cube_map support for i830. Most of the code was
lifted from the i915 side.  i830 will now report version 1.3!  Hurrah!
With the exception of GL_EXT_texture_compression_s3tc, the i830 driver
now supports all the extensions that its Windows counterpart supports.
2004-09-19 08:03:46 +00:00
Ian Romanick
b9bbe78031 Added GL_ARB_point_parameters support for i830. 2004-09-19 07:15:38 +00:00
Ian Romanick
be3359bad5 Merge in all the i830 functional differences from the old i830 driver. 2004-09-19 07:01:26 +00:00
Karl Schultz
ffe52c6444 rearrange a couple of lines of code to avoid compilation error in VC 6,
probably due to a compiler bug.
2004-09-17 22:02:05 +00:00
Eric Anholt
6616146698 Symbol names are prepended with an underscore on CYGWIN as well.
X.Org Bugzilla:	1079
Submitted by:	Alexander Gottwald <ago@freedesktop.org>
2004-09-17 05:10:33 +00:00
Brian Paul
a511b70f44 silence warnings 2004-09-16 19:40:22 +00:00
Brian Paul
37c0497d98 silence warnings, re-indent code 2004-09-16 19:39:04 +00:00
Brian Paul
4ebf9590c3 VBO refcount and spriteblast fixes 2004-09-16 19:33:44 +00:00
Brian Paul
6fedd4e3bf clean-up the hokey transformation code so that window resizes actually work 2004-09-16 19:32:49 +00:00
Brian Paul
b18715fea3 replace glNormal3f(v) with GL_CALL(Normal3f)(v), etc (Andreas Stenglein 2004-09-15 14:49:33 +00:00
Brian Paul
d4aaa68979 in _mesa_problem() include version number in error message 2004-09-15 14:40:14 +00:00
Brian Paul
765f1a12c6 also fix possible delete bugs with buffer objects and vertex/fragment programs 2004-09-14 22:28:27 +00:00
Brian Paul
8de924dbb0 fixed glDeleteTextures bug 2004-09-14 20:43:22 +00:00
Brian Paul
6917201ede Have the rendering contexts share textures.
Put simple checker pattern on the objects.
Press 'd' to delete texture, 'u' to unbind it.
2004-09-14 20:42:53 +00:00
Brian Paul
f18fc68707 Repeatedly deleting a texture ID with glDeleteTextures() could lead to a crash.
Added a DeletePending flag to texture object struct to fix that.
Other misc clean-ups.
2004-09-14 20:40:55 +00:00
Brian Paul
d84f09306c Replace -lGL with -l$(GL_LIB), etc.
Remove GLU_LIB_DEPS, OSMESA_LIB_DEPS lines if identical to 'default' file.
2004-09-13 21:04:48 +00:00
Brian Paul
86cdad1b2f added GL_MAX_VERTEX_ATTRIBS_ARB bug fix 2004-09-13 19:59:06 +00:00
Brian Paul
c3912b66ab Handle GL_MAX_VERTEX_ATTRIBS_ARB in glGet*().
Define 2.0 point-sprite related tokens in glheader.h (temporary).
2004-09-13 19:58:27 +00:00
Ian Romanick
4ef9ad22ae Minor extension string tweaks. Added support for vertex program extensions.
Tested with arbvptorus, arbvpwarpmesh, vptorus, and vpwarpmesh.
2004-09-13 16:36:44 +00:00
Brian Paul
051f6a5cb0 remove ARB_texture_non_power_of_two from _mesa_enable_1_5_extensions() 2004-09-13 14:55:07 +00:00
Brian Paul
1fcac8b1c1 adjust texcoords for texture rectangle sampling 2004-09-13 14:54:19 +00:00
Brian Paul
114246eb86 tweak texcoord for sampling texture rectangles (Dave Reveman) 2004-09-13 14:53:02 +00:00
Daniel Borca
b66f674410 cleanup and bugfixes for fxDDClear() 2004-09-13 09:31:28 +00:00
Daniel Borca
802632e62d cleanup and some changes towards GL_ARB_point_sprite (two-zero) 2004-09-13 09:29:30 +00:00
Daniel Borca
eabfd43ad4 cleanup 2004-09-13 09:27:03 +00:00
Daniel Borca
a9ea1628da changes towards GL_ARB_point_sprite (two-zero) 2004-09-13 08:47:01 +00:00
Brian Paul
e54464e9d3 updated ggi files in tarball list 2004-09-10 22:13:18 +00:00
Brian Paul
89ac4fc6bf applied patch #1026109 2004-09-10 22:12:36 +00:00
Brian Paul
0479ce06d4 updated from patch 1026109 2004-09-10 22:12:14 +00:00
Brian Paul
5cc7111f72 new file (bug 1026109) 2004-09-10 22:11:33 +00:00
Brian Paul
0a55db041d removed (bug 1026109) 2004-09-10 22:08:33 +00:00
Brian Paul
a290fd6aa1 ggi updates 2004-09-10 19:20:56 +00:00
Brian Paul
0cabfa68c3 assorted updates (bug #1025977) 2004-09-10 19:19:24 +00:00
Brian Paul
e14c225597 misc updates for 6.2 release 2004-09-10 16:42:40 +00:00
Brian Paul
8a970af976 updated error msg 2004-09-10 14:41:55 +00:00
Jose Fonseca
a9a155e574 Use CSS in custom headers. 2004-09-10 11:47:51 +00:00
Brian Paul
5c6ede2060 fix matrix classification and program parsing error state bugs 2004-09-10 01:07:05 +00:00
Brian Paul
7f76b8ffd1 reset error state before parsing (David Reveman) 2004-09-10 01:05:39 +00:00
Brian Paul
253204f9f0 More updates for Doxygen. 2004-09-10 00:45:12 +00:00
Brian Paul
7e5c452efb added glapi and shader modules, misc updates 2004-09-10 00:44:09 +00:00
Jose Fonseca
375457bcef Update the doxygen configuration file.
Minor updates/fixes to the source documentation.
2004-09-09 22:23:24 +00:00
Brian Paul
2dab997cb9 fix a bug in analyse_from_scratch() reported by Wes Bethel 2004-09-09 19:58:03 +00:00
Brian Paul
7dc9a8827d clean-ups and comments 2004-09-09 19:57:26 +00:00
Brian Paul
281f855629 initial bits for DRI_FILES for putting DRI driver sources into the tarball 2004-09-09 18:17:36 +00:00
Brian Paul
d86d1483ac Another attempt at fixing name mangling and gl__unused413(). 2004-09-09 18:13:35 +00:00
Dave Airlie
c18fe0c92b updated patch for vertex program 2004-09-08 08:51:12 +00:00
Dave Airlie
0866b67fdb This patch enables GL_ARB_vertex_program and GL_NV_vertex_program
support in the r200 driver. Both extensions can be enabled via
options, GL_ARB_vertex_program is on by default, GL_NV_vertex_program
off. Option descriptions are in german, english and french.

From: Philipp Klaus Krause
2004-09-07 09:56:19 +00:00
Dave Airlie
e520b72e89 Add a solo-x86 config, and make solo use the x86 glapi 2004-09-07 00:41:40 +00:00
Daniel Borca
58c4937e12 make sure the HW is clean before shooting the pipeline 2004-09-03 06:32:18 +00:00
Keith Whitwell
f3d960054e r200-maybe-flush-less-3.diff 2004-09-02 07:33:41 +00:00
Brian Paul
72b395fbba also test for __arm__ for setting USE_IEEE (X bug 1155) 2004-09-01 04:36:29 +00:00
Keith Whitwell
535408adda The i915 driver was merged after EMIT_*_BGR bug was fixed. This brings
the driver into line with the correct meaning of those symbols
and fixes color corruptions.
2004-08-31 11:36:14 +00:00
Daniel Borca
c372549036 newer Glide3x snaps vertices internally for V1/VR/VB 2004-08-31 06:34:51 +00:00
Daniel Borca
2b0f589328 document MESA_FX_NOSNAP 2004-08-31 06:32:34 +00:00
Brian Paul
dbc4830d87 updated CFLAGS (Anich Gregor) 2004-08-30 20:53:49 +00:00
Daniel Borca
171614abbd remove CR 2004-08-30 09:10:34 +00:00
Daniel Borca
367850dbfe cleanup 2004-08-30 09:06:27 +00:00
Daniel Borca
7a42f1562d revived unused code, but got rid of warnings 2004-08-30 09:05:01 +00:00
Daniel Borca
5b2434c5d1 cleaned up extensions a bit 2004-08-30 08:44:32 +00:00
Daniel Borca
d4462dc975 clamp lodbias 2004-08-30 08:43:26 +00:00
Daniel Borca
d17c1769ca fixed automatic mipmap generation 2004-08-30 08:41:25 +00:00
Daniel Borca
554321af7b fog really needs W 2004-08-30 08:40:05 +00:00
Daniel Borca
b1f709cc88 remove CR 2004-08-30 08:37:57 +00:00
Daniel Borca
eec588be6f Werror is bad, unless you know what you are doing 2004-08-30 08:34:52 +00:00
Brian Paul
a5bc6421df bump version to 6.2, add installmesa to tarballs 2004-08-27 15:31:20 +00:00
Brian Paul
a9aa19e4ce ICD update from Gregor Anich 2004-08-25 22:57:20 +00:00
Brian Paul
b7d048405c move (void) foo; instances after local declarations 2004-08-25 19:12:35 +00:00
Brian Paul
d0bdae8a28 print internalFormat value in r200ChooseTextureFormat() error message 2004-08-25 17:36:34 +00:00
Brian Paul
a6c423d956 Silence gcc 3.4 warnings on ReactOS. Mostly unused var warnings. (patch 1015696) 2004-08-25 15:59:48 +00:00
Brian Paul
866286936a regenerated with license info 2004-08-25 15:33:49 +00:00
Brian Paul
0e9929ac10 Makefile for python-generated files (Ian Romanick) 2004-08-25 15:33:11 +00:00
Brian Paul
cd24885429 use version generated from the XML database 2004-08-25 15:22:35 +00:00
Brian Paul
d99e5505f3 fix MGL namespace warning (patch 1014800) 2004-08-25 15:20:56 +00:00
Brian Paul
9554411af6 return type for MapBuffer was not specified 2004-08-25 15:19:40 +00:00
Brian Paul
5920b722b7 Fix mgl name mangling (patch 1014800) 2004-08-25 15:10:51 +00:00
Brian Paul
86e001b78c Windows ICD driver code (patch 1014800) 2004-08-25 14:59:45 +00:00
Brian Paul
7c544d3685 fix a couple bad casts 2004-08-25 14:52:01 +00:00
Brian Paul
be9b759ab0 remove BeOS conditional code. oglinfo should be moved to xdemos since it's a GLX program 2004-08-25 14:51:18 +00:00
Brian Paul
0ad6554338 print current config name before building src and progs 2004-08-25 14:49:41 +00:00
Brian Paul
3b550e1e3c work around a param bug (Adam Jackson) 2004-08-25 14:39:40 +00:00
Philippe Houdoin
f43cc67616 Disable x86 iround() version on BeOS with gcc < 2.95.x, as it choke GAS.
BTW, that's remove the requirement to build Mesa on BeOS with gcc 2.95.3.
Still recommanded for performance, thought ;-)
2004-08-24 08:54:04 +00:00
Philippe Houdoin
0f539de57e Todo list updated. Build instructions detailed. 2004-08-24 08:31:57 +00:00
Philippe Houdoin
b227e90837 Duplicate CFLAGS in CXXFLAGS removed. Now define DEBUG symbol in debug build. 2004-08-24 08:17:08 +00:00
Felix Kuehling
c2530b5730 Converted the Savage driver to the new DRI interface and enabled compilation
in the Mesa tree.
2004-08-22 20:31:40 +00:00
Brian Paul
b1e178c69b release notes for 6.2 2004-08-22 17:43:31 +00:00
Brian Paul
b0f08737ba IRIX fixes 2004-08-22 17:42:03 +00:00
Brian Paul
9debd5620d added src/glw/depend to tarball list 2004-08-22 17:41:44 +00:00
Brian Paul
17386de1d9 cast to fix a warning (in disabled code anyway) 2004-08-22 17:24:27 +00:00
Brian Paul
bc3a5336d9 don't use __FUNCTION__ - not portable 2004-08-22 17:23:22 +00:00
Brian Paul
370b47802e check if __mips or _MIPS_ARCH is defined to set IEEE_ONE (bug 1003026) 2004-08-22 16:57:40 +00:00
Brian Paul
5f9c21ae67 also check for __hppa__ and hpux for IEEE support (bug 1003026) 2004-08-22 15:19:03 +00:00
Brian Paul
edfe0fe78b enabled GL_ARB_texture_rectangle 2004-08-20 14:21:20 +00:00
Daniel Borca
d4edb53201 hide GL_ARB_texture_compression from non-VSA cards 2004-08-20 08:34:30 +00:00
Daniel Borca
14c532f767 cleanup 2004-08-20 08:29:24 +00:00
Brian Paul
e4a4d04170 first bug fix for v6.2 2004-08-19 18:34:41 +00:00
Brian Paul
b160cbf87a bump version to 6.2 2004-08-19 18:34:15 +00:00
Brian Paul
a1dad07249 don't check for ARB_texture_non_power_of_two for OpenGL 1.5 (Philipp Klaus Krause) 2004-08-19 18:33:13 +00:00
Jouk Jansen
b8e148c2c9 Committing in .
Missing .'s

 Modified Files:
 	Mesa/src/mesa/main/descrip.mms Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2004-08-19 14:21:18 +00:00
Daniel Borca
5d0efec190 why is GL_ARB_texture_env_combine different from EXT? 2004-08-19 06:59:05 +00:00
Daniel Borca
50a84ce41e "const int _nc" was really stupid... 2004-08-19 06:58:00 +00:00
Daniel Borca
55497973be cleanup 2004-08-19 06:56:51 +00:00
Daniel Borca
fd9757d3b9 silence compiler warnings 2004-08-19 06:51:48 +00:00
Brian Paul
740cbb1559 added Mesa 6.1 release info 2004-08-18 22:41:09 +00:00
Brian Paul
efb2ade520 check for either GL_NV_vertex_program or GL_ARB_vertex_program for some enables 2004-08-18 18:45:25 +00:00
Brian Paul
e41460bf77 updates from Jouk 2004-08-18 14:47:16 +00:00
Brian Paul
6aa5b4cb91 set release date for 6.1 2004-08-17 22:58:23 +00:00
Eric Anholt
626f825bcc Revert the move of lost_context setting to UNLOCK_HARDWARE that was done in the
last commit.  I've been convinced by keithw that it's sufficient, and put a note
in the code about it.

Close another race for state in the Clear functions.  I made the situation worse
in my last commit, but this should fix things.  Might be a slight performance
hit, which could be regained by splitting the R*_FIREVERTICES calls in r*Clear
up so that the EmitState doesn't happen in a separate new cmdbuf.
2004-08-17 20:10:29 +00:00
Brian Paul
ffdea1ae80 don't enable the float texture and GLhalf pixel extensions yet 2004-08-17 19:25:55 +00:00
Ian Romanick
6fc61be869 Fixed an assembler warning / error (depending on the version of GAS used).
Fixed a crash in the optimized pthreads dispatch path.
2004-08-17 17:03:24 +00:00
Brian Paul
51830613a9 some updated info about adding new extensions 2004-08-17 14:08:59 +00:00
Eric Anholt
6f3cc6a522 Close some races with locking on R100 and R200 which could manifest as rendering
errors on r100 and rendering errors and hangs on r200 (same for R100 without
OLD_PACKETS).

If a command buffer filled after some state (EmitState or a VBPNTR write) was
emitted, the lock was grabbed, the buffer flushed, a new buffer prepared, and
the lock dropped.  Another client could come in, set its own state as part of
rendering, and when the first client flushed the rendering commands depending
on the previous state, it got the 2nd client's state.  This is fixed by checking
for enough space before beginning a set of state emits and rendering, and
flushing the buffer first if so.  This guarantees that the buffer won't wrap.

Also, move the "lost_context = 1" from the end of cmdbuf flushing to
UNLOCK_HARDWARE for clarity (at a minimum) that any time the lock is dropped,
state may get overwritten.  We don't have enough information at the point of the
LOCK_HARDWARE to reset our state to the last UNLOCK_HARDWARE point in the case
that we did lose our context, but saving the information to rebuild that state
may be a useful optimization (ipers data suggests up to 5%).
2004-08-17 01:41:29 +00:00
Brian Paul
7e27ab4c6a whitespace clean-up, new 'clean' commands 2004-08-16 17:11:10 +00:00
Daniel Borca
153f479697 prepared for release 2004-08-16 08:47:19 +00:00
Philippe Houdoin
479b3d0745 Add glutGetProcAddress(). Not all GLUT version 5 APIs are supported yet, thought.
-> #define GLUT_API_VERSION 4.5 ? ;-)
2004-08-16 08:46:38 +00:00
Philippe Houdoin
375047ba72 make clean at root now clean the glu/$(GLU_DIRS) too. 2004-08-16 08:42:05 +00:00
Philippe Houdoin
ac07d89fd3 Stupid me. I don't know why I moved the GLView.h here at first, but now I know why
I shouldn't:
Official BeOS GLView.h defines a virtual ErrorCallback(GLenum) method, assuming
a unsigned long GLenum.
But under Mesa, GLenum is unsigned int.
To keep binary compatibility, BeOS apps including Mesa GL/gl.h MUST include *our*
GLView.h, or linker will report a missing ErrorCallback(unsigned int) symbol. Glup.
2004-08-16 08:39:36 +00:00
Daniel Borca
ddff352586 cleanup 2004-08-16 08:34:13 +00:00
Daniel Borca
624477afbb fixed texture fetchers, fixed automatic mipmap generation, some cleanup 2004-08-16 08:32:06 +00:00
Daniel Borca
cd643491ad fixed pixel drawing routines, some cleanup 2004-08-16 08:30:41 +00:00
Daniel Borca
616a5b64f9 disabled stereo checking in wglChoosePixelFormat 2004-08-16 08:01:43 +00:00
Philippe Houdoin
a95aba7d1f Clearer guard message text. 2004-08-16 07:46:28 +00:00
Eric Anholt
0de671f19a Remove unused HAVE_INDEX define. 2004-08-16 04:38:48 +00:00
Philippe Houdoin
4ad28c9d9a GLInfo now show GLU and GLUT infos too. Fix the includes paths 2004-08-15 14:06:00 +00:00
Philippe Houdoin
af2f26f7de Obsoleted as demos programs build on BeOS with standard Makefile system. 2004-08-15 11:43:47 +00:00
Brian Paul
98ae32c0f7 fix swrast/shader typo 2004-08-14 21:53:14 +00:00
Karl Schultz
d48ef3ebe7 add shader.dsp and descrip.mms to tarball list for relatively new shader dir. 2004-08-14 21:42:50 +00:00
Brian Paul
244af16c43 updated tarball list for BeOS changes 2004-08-14 21:12:37 +00:00
Karl Schultz
931ef21c42 Update Visual Studio Project file for src tree updates. 2004-08-14 20:07:01 +00:00
Karl Schultz
7a7e04039e New Visual Studio project file for this directory. 2004-08-14 20:02:59 +00:00
Karl Schultz
cec756ae3a Minor tweaks to deal with vsnprintf and __FUNCTION__ on WIN32 2004-08-14 19:28:48 +00:00
Brian Paul
4d69189ac0 minor update to intro, and some word wrapping 2004-08-14 15:23:51 +00:00
Brian Paul
946765a95f BeOS updates, memory leak fix, updated release notes 2004-08-14 15:21:17 +00:00
Brian Paul
b784b8f21f indentation fixes 2004-08-14 14:30:36 +00:00
Philippe Houdoin
25f2d96a8f Turn gcc optimization up to -O3. 2004-08-14 14:29:21 +00:00
Brian Paul
21841f0ae5 fix some memory leaks (bug #1002030) 2004-08-14 14:28:11 +00:00
Philippe Houdoin
f226191d52 Remove obsoleted BeOS-specific makefiles.
Add a makefile to build old Mesa GLU, whatever it worth.
Add a guard to stop building libGLU.so on BeOS, as it's build into libGL.so.
2004-08-14 14:27:32 +00:00
Philippe Houdoin
92cb914321 Add a guard to stop building libGLU.so under BeOS, as it's build into libGL.so. 2004-08-14 14:24:48 +00:00
Philippe Houdoin
8c6f59ce54 Forgot to commit this valuable file! :-) 2004-08-14 14:22:35 +00:00
Philippe Houdoin
18985fb231 Remove obsoleted BeOS-specific makefile as the main Makefile system now
support BeOS platform too.
2004-08-14 10:49:31 +00:00
Philippe Houdoin
b8b12a9933 Replaced the .cpp-ized (for build issue) common GLUT source files by their
standard .c version.
Remove unused libglut.def.
2004-08-14 10:42:57 +00:00
Philippe Houdoin
bba512b75b Replaced the .cpp-ized (for build issue) common GLUT source files by their
standard .c version.
Remove outdated Makefile.orig.
2004-08-14 10:37:03 +00:00
Philippe Houdoin
a041e62418 Update to Jake Hamby's BeOS GLUT 3.7 port. 2004-08-14 10:27:08 +00:00
Philippe Houdoin
fad0e5d448 Move to $(TOP)/configs/default-based makefile. 2004-08-14 10:21:08 +00:00
Philippe Houdoin
ef4dd5ad79 Update BeOS mklib to set mimetype and version.
Static lib build support added.
2004-08-14 10:12:38 +00:00
Philippe Houdoin
92ec9975fe BeOS now officially moved to main Makefiles chain. To build under BeOS: "make beos" 2004-08-14 10:10:42 +00:00
Philippe Houdoin
b44cf6df1c Updated according to new way to build under BeOS. 2004-08-14 10:06:21 +00:00
Philippe Houdoin
789dd56699 Obsolete the BeOS-specific makefile as we now build using standard Makefiles chain. 2004-08-14 10:05:33 +00:00
Philippe Houdoin
ea446b56ab Obsolete BeOS-specific makefile.
Removed the oglinfo target from samples from BeOS build, as it depends on X.
2004-08-14 10:03:11 +00:00
Philippe Houdoin
f17ddd4884 Fix demo.cpp, which wasn't working as expected.
Add a GLInfo app, a graphical tool displaying GL Info as a treeview.
Usefull to see which OpenGL renderer you use and which extension(s) is supported.
Convert the Makefile to be $(TOP)/configs/default-based.
2004-08-14 09:59:16 +00:00
Philippe Houdoin
41ea155878 Obsoleted. Now, the BeOS targets build by main Makefiles chain. 2004-08-14 09:52:18 +00:00
Philippe Houdoin
428be67663 Silent compiler "variable may be used uninitialized" warnings. 2004-08-14 09:51:30 +00:00
Philippe Houdoin
b4907820c2 BeOS's _glthread_DECLARE_STATIC_MUTEX() couldn't be used outside a function
because she called create_sem(). Now the semaphore creation is made at first
_glthread_LOCK_MUTEX() call.
2004-08-14 09:48:57 +00:00
Philippe Houdoin
4b3be4d8be Fix a bug that set RGBA bits length always to 0 (reported by Marcin Konicki).
PPC byte order now supported (thanks Nathan Whitehorn).
Double buffering is now always forced.
Unlock the BGLView looper only if needed. Should fix the GLUT-based apps crash
at window closing.
SwapBuffers() now can wait for next vertical retrace.
And several other minor changes...
2004-08-14 09:43:07 +00:00
Dave Airlie
7b0c30574c build fix from XFree86 tree 2004-08-14 09:29:24 +00:00
Philippe Houdoin
3184830487 Move BeOS build into main Makefiles chain. 2004-08-14 09:23:09 +00:00
Philippe Houdoin
af8031ce5c Add a BeOS build config. 2004-08-14 09:18:04 +00:00
Dave Airlie
1cdfb69116 bring over change from xorg trunk - let build on non-i386 2004-08-14 09:09:56 +00:00
Dave Airlie
56999adb21 bring over build fix from xorg tree 2004-08-14 09:08:27 +00:00
Brian Paul
b1872fed15 silence a warning 2004-08-13 21:05:02 +00:00
Brian Paul
2fe6e913ca minor fix for newest glxext.h header 2004-08-13 21:04:04 +00:00
Brian Paul
02ca8fe85d added some missing sources to tarball list 2004-08-13 20:58:59 +00:00
Eric Anholt
b292642de0 Fix dri_util.c build with new headers.
Submitted by:	John Lightsey <john@nixnuts.net>
2004-08-12 21:50:03 +00:00
Brian Paul
3bbdcdcdb8 cvs ignore file 2004-08-10 15:42:14 +00:00
Brian Paul
d462841384 updated glext.h and glxext.h files 2004-08-10 15:40:20 +00:00
Brian Paul
52a5cc0bae minor anim tweak 2004-08-10 15:39:00 +00:00
Brian Paul
5222662f52 silence warning 2004-08-10 15:36:46 +00:00
Brian Paul
16c8dce363 use 'a' to toggle animation 2004-08-10 15:36:31 +00:00
Brian Paul
47a6749b33 minor tweaks 2004-08-10 15:34:51 +00:00
Brian Paul
f2afdcae9a query/print max convolution filter size 2004-08-10 15:32:25 +00:00
Brian Paul
dfbb84ea2c added some handy debug code (disabled) 2004-08-10 15:30:41 +00:00
Brian Paul
cec85c778f added a few more debug printfs (disabled) 2004-08-10 15:30:16 +00:00
Jon Smirl
521ebf670a Fix from Rogelio Serrano for miniglx double buffering 2004-08-09 22:14:57 +00:00
Roland Scheidegger
8bd0a627fd fix incorrect overflow detection when emitting R200_SS_MAT_1_SHININESS 2004-08-03 13:03:33 +00:00
Dave Airlie
a032297b32 xorg-r200-uninitialized-variable-used.patch from Redhat xorg 2004-07-31 08:14:50 +00:00
Daniel Borca
d9166e132e disabled automatic mipmaps until we can handle 565 textures. 2004-07-29 08:31:26 +00:00
Daniel Borca
10e768c11b fixed conflict between depth & alpha in 16bpp 2004-07-29 08:25:03 +00:00
Brian Paul
0a10abf93e vtk and Paraview links updated 2004-07-28 15:55:13 +00:00
Brian Paul
6ade8a36b6 version 6 from oss.sgi.com 2004-07-28 13:23:11 +00:00
Brian Paul
196fb036d6 version 24 from oss.sgi.com 2004-07-28 13:22:46 +00:00
Brian Paul
c2800e08ec don't use GLuint or GLvoid in function declaration 2004-07-27 16:32:37 +00:00
Daniel Borca
27df1ec1cd disable W1 when single-texturing 2004-07-26 15:10:34 +00:00
Brian Paul
146852881f consistantly use unpack parameter, instead of ctx->Unpack (Daniel Borca) 2004-07-26 15:09:22 +00:00
Felix Kuehling
fff87eecbe Fixed hash table allocation to avoid an assertion failure due to a
bad config file. Fixed two more typos.
2004-07-26 12:42:36 +00:00
Daniel Borca
dec1191d45 Rush is back on ZBUFFER
added DrawPixels555 and DrawPixels565
2004-07-26 08:04:22 +00:00
Brian Paul
6b41bf3afc use GL_CALL() macro (Andreas Stenglein) 2004-07-24 15:18:36 +00:00
Brian Paul
dfa5c2bfbb new MESA_GLX_DEPTH_BITS env var 2004-07-23 23:32:15 +00:00
Brian Paul
eae26ca4ba minor comments 2004-07-23 22:56:29 +00:00
Brian Paul
840565cd47 updates from Stephane Marchesin 2004-07-23 19:30:33 +00:00
Brian Paul
4f6b1ad952 added MESA_GLX_FORCE_ALPHA env var 2004-07-23 15:49:12 +00:00
Brian Paul
a13331d59b added support for MESA_GLX_FORCE_ALPHA env var 2004-07-23 15:47:04 +00:00
Brian Paul
b8f29f29eb ALIGN16 macro repairs 2004-07-23 15:45:56 +00:00
Daniel Borca
a48edcf69c fixed pixelpiped DrawBitmap / DrawPixels (clipping was upside-down) 2004-07-23 08:59:09 +00:00
Daniel Borca
1635040a9e partial GL_BLEND for Voodoo1 2004-07-21 08:46:55 +00:00
Daniel Borca
15a0b086b4 minor doc update 2004-07-21 08:45:35 +00:00
Daniel Borca
1b868b1e54 fixed a bug in clear routine 2004-07-21 08:44:26 +00:00
Brian Paul
782a32b847 fix compare w/ zero warnings (bug 988766) 2004-07-20 21:16:07 +00:00
Brian Paul
5fe90292f8 error message fixups and some debug code 2004-07-20 21:15:13 +00:00
Brian Paul
bd997cd11f fix compare w/ zero warnings (bug #988766) 2004-07-20 21:12:56 +00:00
Brian Paul
5f3b3a3827 new image (see mesa bug #993926) 2004-07-20 21:00:34 +00:00
Brian Paul
9408fe0c09 remove -lXm (motif) from GLW_LIB_DEPS since it's not needed by default 2004-07-20 20:43:24 +00:00
Daniel Borca
6beec97521 GL_EXT_texture_env_add shouldn't be conditioned by multitex, or should it? 2004-07-20 10:33:21 +00:00
Daniel Borca
e7e86eaf3e trying vertex_program... 2004-07-19 14:08:46 +00:00
Daniel Borca
1c2a498119 several new bugs 2004-07-19 08:06:00 +00:00
Daniel Borca
25f0e8227f minor corrections 2004-07-16 07:54:46 +00:00
Daniel Borca
1ff6188c09 GL_MODULATE/GL_REPLACE multitex (wasteful, but apparently needed by some apps) 2004-07-16 07:53:53 +00:00
Daniel Borca
0f7eb92249 SGIS_generate_mipmap 2004-07-16 07:53:02 +00:00
Jon Smirl
dc8a7603a3 Miniglx clients now authorize with server DRM 2004-07-16 04:27:00 +00:00
Dave Airlie
84e6b16d8f add debugging for compresssed textures 2004-07-15 10:51:17 +00:00
Dave Airlie
c058917343 fix up heights for i830/i915 texture compression 2004-07-15 10:47:13 +00:00
Dave Airlie
78e19b5f98 move config options to same place as other drivers (again for S3TC patch later) 2004-07-15 08:50:27 +00:00
Dave Airlie
620c998b16 use a switch statement makes integrating the s3tc patch easier 2004-07-15 08:41:26 +00:00
Dave Airlie
11a03a18ad enable FXT1 texture compression for ixxx chipsets
commented out Keiths extensions strings
2004-07-15 08:08:44 +00:00
Dave Airlie
43942fd5e3 move over changes to intel driver from i830 driver for modes 2004-07-15 06:29:16 +00:00
Daniel Borca
ba3d088e27 fixed vertex RGBA 2004-07-13 06:45:56 +00:00
Jon Smirl
9a9614e4e9 Make solo radeon/r128 drivers track fix for DRI bug 849 2004-07-10 21:17:52 +00:00
Jon Smirl
bdf3e2ba1f Remove DRM_PAGE_SIZE from fb and i810 drivers since it was being used. 2004-07-10 19:14:18 +00:00
Jon Smirl
65293d8f73 Fix unichrome solo build to not need X11 headers. Minor change to
use mesa_alloc/free.
2004-07-10 17:09:57 +00:00
Felix Kuehling
486e5c26dc Make GET_PROGRAM_NAME work with uCLibc using the __progname hack.
Improved that hack to remove leading directory names.
2004-07-10 11:25:02 +00:00
Jon Smirl
368f3c551b Fix mesa-solo config to define _GNU_SOURCE so that program_invocation_short_name
will be correctly defined.
2004-07-09 18:46:51 +00:00
Daniel Borca
d53d429ed2 use tnl_emit_func, it's safer 2004-07-06 12:37:09 +00:00
Roland Scheidegger
d2dbb25372 correct X86_DISPATCH_FUNCTION_SIZE if THREADS is defined 2004-07-06 00:32:03 +00:00
Jon Smirl
1e7ce9f6f1 Convert miniglx to use xf86drm from dri/drm/libdrm instead of src/mesa/drivers/dri/dri_client 2004-07-05 23:51:48 +00:00
Jon Smirl
5500094413 Convert miniglx to use Ian's fancy new driver config code.
This removes the miniglx driver function InitContextModes().
All of the server directories were edited to remove the implementations.
2004-07-05 23:42:02 +00:00
Ian Romanick
10b3bf6013 Fix typos in comments. 2004-07-05 22:42:14 +00:00
Ian Romanick
6c5402bccd Another "if it ain't broke, don't fix it" moment. Revert some more
code in _glapi_set_dispatch to its 1.74 form.  This fixes a "problem"
with buggy apps that make GL calls with no bound GL context (i.e.,
Enemy Territory during shut-down).
2004-07-05 22:40:54 +00:00
Brian Paul
8a08853536 fixed AIX color interpolation bug 2004-07-05 14:54:16 +00:00
Brian Paul
cbc96b705d patch for AIX (bug 983144) 2004-07-05 14:50:12 +00:00
Brian Paul
cacf473732 added cast to fix AIX color interpolation problem (bug 983144) 2004-07-05 14:48:15 +00:00
Daniel Borca
3e94fd3444 added GL_ARB_point_sprite.
color masking correctly implemented for 15bpp.
small fixes for textures and tri engine.
2004-07-05 06:47:17 +00:00
Daniel Borca
fd003824ad fixed non-threaded codepath 2004-07-05 06:15:37 +00:00
Eric Anholt
3e77737955 Bugzilla #755: Fix polygon offset by setting DEPTH_SCALE to depth_scale instead
of 1.0.
2004-07-04 20:49:04 +00:00
Jon Smirl
aaebfc88c0 Patch removes _SOLO definition needed for mesa-solo. mesa-solo
uses the NEW_INTERFACE now so _SOLO isn't necessary anymore.
Tested with the hardware that I own.
2004-07-04 20:33:48 +00:00
Brian Paul
2371033bba document some assumptions made about compressed texture tile size 2004-07-02 16:39:59 +00:00
Brian Paul
1675058a34 a few comments 2004-07-02 16:36:29 +00:00
Brian Paul
bbea6ec0b6 disable some debug printfs 2004-07-02 14:35:50 +00:00
Brian Paul
d07859e718 redo the event loop to make event response better 2004-07-02 14:35:05 +00:00
Brian Paul
3bdc8535fc init some vars to silence warnings 2004-07-02 14:22:42 +00:00
Daniel Borca
009542a0f7 added GL_EXT_fog_coord.
added GL_EXT_blend_equation_separate.
minor cleanup.
2004-07-02 10:34:48 +00:00
Daniel Borca
3aa364c8e1 put back the correct dispatcher for non-threaded builds.
fixed x86 entrypoints for Mingw/DJGPP.
2004-07-02 10:32:52 +00:00
Ian Romanick
d14d103a0c Fix a potential race condition. Fix a couple of places where
_glapi_DispatchTSD wasn't properly handled.
2004-07-02 00:01:09 +00:00
Ian Romanick
2491d5135b Make sure THREADS is set no matter which threading model is selected. 2004-07-01 23:58:15 +00:00
Brian Paul
dedff2c3b2 just a test; no change 2004-07-01 20:13:26 +00:00
Brian Paul
953f2a6a2b just a test; no change 2004-07-01 20:12:44 +00:00
Brian Paul
9eaecaf21a just a test; no change 2004-07-01 17:57:00 +00:00
Brian Paul
41fc5952e5 just a test; no change 2004-07-01 17:56:29 +00:00
Brian Paul
04e29afdff just a test; no change 2004-07-01 16:06:32 +00:00
Brian Paul
76cfed853f added commands for AIX shared libs (Shane Blackett) 2004-07-01 15:33:14 +00:00
Brian Paul
6d50d91ae4 added aix-static config, make aix config build dynamic libs 2004-07-01 15:32:51 +00:00
Keith Whitwell
3d38361b71 Rename the various function types in t_context.h to include a tnl_ prefix. 2004-07-01 13:14:05 +00:00
Keith Whitwell
c3c8c71846 Remove __driRegisterExtensions 2004-07-01 13:00:19 +00:00
Keith Whitwell
f8b1825f97 Rename 'emit_func' usages in drivers. Will also rename the ones in
t_context.h.
2004-07-01 12:01:59 +00:00
Alan Hourihane
869fc59b63 fix for older gcc's (from freedesktop bug id #419) 2004-07-01 11:35:53 +00:00
Keith Whitwell
160215bdeb Add t_context.h include for drivers. 2004-07-01 05:35:12 +00:00
Keith Whitwell
009aa3ef5e Add infrastructure for t_vertex.c codegen. Add an example driver
for this which spits out C code for the generated functions.
2004-06-30 11:48:21 +00:00
Ian Romanick
8e77da1cd7 First phase of TLS work. At this point SPARC assembly dispatch is
broken, but it will be fixed "shortly."  This is pretty much the same
as the patch I sent to the dri-devel list on 22-Jun-2004.
2004-06-29 19:08:20 +00:00
Jon Smirl
c61c7cb8e4 This should make most linux-solo drivers work again. Mainly a fix
for changing SAREA size form DRM_PAGE_SIZE to SAREA_MAX. fb driver
is still broken.
2004-06-29 04:50:29 +00:00
Brian Paul
7c1207a2ec fixed vertex program state references 2004-06-29 00:30:06 +00:00
Brian Paul
fc84e82b28 fix another bug in get_register_pointer() 2004-06-29 00:21:04 +00:00
Brian Paul
80cc018a68 the get_register_pointer() function was pretty well broken in a few ways 2004-06-29 00:03:59 +00:00
Brian Paul
ac33dd1312 disable some debug code 2004-06-29 00:00:29 +00:00
Brian Paul
824fdf035e remove trailing whitespace and misc clean-ups 2004-06-29 00:00:06 +00:00
Roland Scheidegger
26755698c8 add missing R200_RB3D_BLENDCOLOR to r200/radeon_sanity.c 2004-06-28 22:32:38 +00:00
Brian Paul
dbe1ecaa1d option to test with display lists 2004-06-28 22:03:44 +00:00
Brian Paul
36bdb07860 glBegin/EndQueryARB bug fix 2004-06-28 22:02:23 +00:00
Brian Paul
d322dc1469 glBegin/EndQueryARB didn't work inside display lists 2004-06-28 22:01:12 +00:00
Brian Paul
625a339a8a make sure Q has a good value before drawing a sample 2004-06-28 15:16:28 +00:00
Jon Smirl
c2bffec91a Mesa-solo builds with these changes. There are still more fixups needed to
get individual drivers working again. This converts miniglx to the new
dri interface. Thanks to Erdi Chen for the new interface code.
2004-06-26 17:16:42 +00:00
Ian Romanick
e16f6e3f23 Re-enable SPARC assembly on sunos5-gcc platform. 2004-06-26 00:02:51 +00:00
Ian Romanick
9eecb03226 Make sure mklib sees the definition of CC and CXX. Make mklib respect
the definitions of CC and CXX on Linux.  This fixed build issues with
sunos5-gcc and build issues on GCC 2.x Linux when CC and CXX are set
to a GCC 3.x compiler.
2004-06-25 22:51:39 +00:00
Erdi Chen
74b380b2ec Corrected a float to ubyte conversion bug with fog enabled. 2004-06-25 20:31:40 +00:00
Brian Paul
c9a415663a remove program from hash table when deleted (bug 979514) 2004-06-25 14:46:48 +00:00
Roland Scheidegger
a09db0a7fa new test which uses mixed texgen/non-texgen texture coordinates to exhibit potential bugs in hardware drivers 2004-06-25 13:49:46 +00:00
Brian Paul
9a47d2b7cf fix GL_HP_occlusion_test bug, use glext.h version 23 2004-06-24 16:39:53 +00:00
Brian Paul
939dd17653 fix HP occlusion testing when using generic span path 2004-06-24 16:35:18 +00:00
Brian Paul
de67b3ea18 fix capitalization, new comments, etc 2004-06-24 16:32:27 +00:00
Brian Paul
6cf3f579ef added library dependencies (bug #978758) 2004-06-24 15:35:42 +00:00
Daniel Borca
adf6d0d9f7 hack for compressed textures with aspectratio greater than 8:1 2004-06-24 06:48:05 +00:00
Daniel Borca
701987c877 disabled unnecessary assertions in texture replicator 2004-06-24 06:44:38 +00:00
Daniel Borca
b3eda2443a added back x86 entrypoints 2004-06-24 06:42:21 +00:00
Brian Paul
0349b4b2ab Fixed occlusion_zless_triangle() to work with 16 or 32-bit Z buffers.
Removed some unneeded lines, other minor clean-ups.
2004-06-23 22:47:46 +00:00
Roland Scheidegger
d7ea75061c revert accidental change from rev. 1.10 2004-06-23 17:37:16 +00:00
Brian Paul
e4fbcd0fca updated to version 23 2004-06-23 14:48:04 +00:00
Ian Romanick
ea93e6d378 Don't include glapi_*.S files in DRI / solo builds. 2004-06-22 21:32:59 +00:00
Brian Paul
6b869d4fe1 Alexander Gottwald's patch for cygwin 2004-06-22 17:16:02 +00:00
Brian Paul
a64feeffca check for NULL pointer to glTexImage (fix verified by Adam Jackson) 2004-06-22 17:06:30 +00:00
Daniel Borca
3ea9cf0d5c added support for non-64bit compilers 2004-06-21 10:41:01 +00:00
Brian Paul
0590786f8a call ctx->Driver.NewProgram() instead of CALLOC/etc in _mesa_LoadProgramNV. Fixes problems found with Cg demos. 2004-06-20 20:57:22 +00:00
Brian Paul
26359143b6 remove redundant program field initializers in BindProgram(); ctx->Driver.NewProgram() does the inits 2004-06-20 20:55:36 +00:00
Brian Paul
636d4db608 latest bug fixes, etc. 2004-06-20 19:17:39 +00:00
Brian Paul
7576b9b19d store's to RC/HC didn't work (bug 976287) 2004-06-20 19:16:55 +00:00
Brian Paul
f252f64430 Big-endian texture fixes from Michel Dänzer. 2004-06-19 17:44:23 +00:00
Brian Paul
07694b8935 Remove ADD_POINTERS code from import() function - it broke UT2004.
Code clean-ups, reformatting, const-correctness, etc.
2004-06-19 15:38:31 +00:00
Daniel Borca
f0f23aaba8 Hack for linear fogging. Added empty routines for WGL_ARB_pixel_format WGL_ARB_render_texture WGL_ARB_pbuffer 2004-06-19 11:07:58 +00:00
Keith Whitwell
1e93e197f9 Use correct macros for packing pixel colors -- this bug is probably
present in many of the other drivers as well.
2004-06-18 10:58:30 +00:00
Keith Whitwell
594c3f67ac add missing license texts 2004-06-18 10:54:48 +00:00
Roland Scheidegger
8ad28091ae use I8 internal format for GL_INTENSITY, GL_ALPHA and GL_LUMINANCE texture formats. Fix various small bugs with tex env combine mode GL_DOT3_RGB(A)/GL_DOT3_RGB(A)_EXT 2004-06-17 21:19:21 +00:00
Roland Scheidegger
e3f926ad51 use I8 internal format for GL_INTENSITY, GL_ALPHA and GL_LUMINANCE texture formats. Fix potential bug with tex env combine mode GL_DOT3_RGB/GL_DOT3_RGB_EXT and ALPHA_SCALE 2004-06-17 21:08:02 +00:00
Roland Scheidegger
6c1833e372 fix tex env mode GL_BLEND for GL_INTENSITY texture formats 2004-06-17 20:54:46 +00:00
Ian Romanick
fb75ca1b65 Make the test check for core GL version 1.3 in addition to testing for
GL_ARB_texture_compression.  Also make the test list the compression formats
the driver "encourages" the app to use.
2004-06-17 20:53:07 +00:00
Dave Airlie
919498e41c Fix up texture compression mipmapping .. not sure if it fixes FXT1 but
with S3TC patch it fixes those
2004-06-17 13:42:45 +00:00
Brian Paul
85ffbdd8d7 fix component indexing bug in _mesa_texstore_al88() 2004-06-16 16:49:59 +00:00
Brian Paul
ed60bc6fdc don't use // comments (Thomas Hellstrom) 2004-06-16 15:33:33 +00:00
Dave Airlie
972ff46a0b remove unused mode function 2004-06-16 12:38:47 +00:00
Dave Airlie
1a544b0500 switch to using driFillInModes fix depthbuffer = 0 2004-06-16 12:31:23 +00:00
Keith Whitwell
6d43ce5402 Fix batch.ptr when dropping a batchbuffer segment due to zero cliprects. 2004-06-16 12:03:53 +00:00
Ian Romanick
fff749e893 Fix a couple typeos in the tables for driFillInModes. 2004-06-15 16:22:45 +00:00
Roland Scheidegger
997e81fe75 added more compressed formats to is_color_format() 2004-06-15 14:11:09 +00:00
Daniel Borca
09c9bfb22d fix correct parameters passed to StoreImage 2004-06-15 09:06:53 +00:00
Adam Jackson
f449e370db _really_ fix parameters to StoreImage calls. 2004-06-14 23:38:00 +00:00
Brian Paul
3405708e21 added compressed formats to is_color_format() and updated some comments 2004-06-14 21:01:08 +00:00
Daniel Borca
3dc3cc9d40 Fixed a bug in vertex emitter (untile we move to t_vertex.c) 2004-06-14 09:11:13 +00:00
Dave Airlie
2a28636274 add i915 as it seems to build okay.. 2004-06-12 02:36:42 +00:00
Brian Paul
7aa0e6125d just a comment 2004-06-11 22:47:47 +00:00
Brian Paul
5b05a187dc disable GL_INTENTSITY in _mesa_is_legal_format_and_type(). See table 3.6 of the 1.5 spec 2004-06-11 22:47:22 +00:00
Brian Paul
916e749241 s/_mesa_get_current_context()/GET_CURRENT_CONTEXT()/ 2004-06-11 22:44:55 +00:00
Brian Paul
8b33258d07 remove the 3dfx CatchSignals stuff (the var was alwasy set) 2004-06-11 22:44:22 +00:00
Brian Paul
beef59e73a added GL_BGR and GL_BGRA to is_color_format() (Ronny Vindenes 2004-06-11 19:08:55 +00:00
Brian Paul
3f3d11d067 fix some minor glitches in glGetTexParameter code 2004-06-11 17:18:26 +00:00
Alan Hourihane
7cbc966324 re-enable rect texture 2004-06-11 15:36:42 +00:00
Brian Paul
4102a3045c fix minor typo in comment 2004-06-11 15:23:04 +00:00
Brian Paul
22dad683b1 don't pass GL_INTENSITY for <format> to glTexImage2D - it's illegal 2004-06-11 15:07:23 +00:00
Brian Paul
694b10ca6d document recent changes/fixes 2004-06-10 20:48:46 +00:00
Brian Paul
601df9c742 Additional error checking for glTexImageXD.
Only allow 1D and 2D GL_DEPTH_COMPONENT textures.
Make sure internal format and user format are in same catagory.
2004-06-10 20:46:23 +00:00
Brian Paul
13ad04719e Roland's patch to fix promotion of alpha or luminance textures to the
luminance_alpha format.  In particular, using the al88 format to store
GL_ALPHA textures with r200 driver.
2004-06-10 17:26:05 +00:00
Keith Whitwell
41b58954e1 New driver for i915 as well as older i830/i845/i865 chipsets. 2004-06-10 12:48:07 +00:00
Dave Airlie
d7f76c7c88 try and find the drm in a more likely place 2004-06-10 10:01:14 +00:00
Dave Airlie
d4dcc6b5c0 Add FXT1 compression support to i830 driver 2004-06-10 09:54:45 +00:00
Eric Anholt
932e6fb420 Fix an "overflow in implicit constant conversion" warning in mEndPrimitive when
more warning flags are enabled (such as in the DRI tree).  Make the second line
prettier, too.

Reported by:	ajax
2004-06-10 09:13:31 +00:00
Adam Jackson
8a41ead407 silence a warning 2004-06-10 08:52:37 +00:00
Dave Airlie
b3a4a07c61 remove unused stuff, fix non-native build 2004-06-09 05:10:29 +00:00
Dave Airlie
15be94fc26 fix mach64 non native.. no reason to use it... 2004-06-09 05:04:46 +00:00
Eric Anholt
59b0db3008 Fix reflect demo: We were using the 3D Clear path unnecessarily, which appears
to be broken in the stencil case for unknown reasons.
2004-06-09 04:59:30 +00:00
Eric Anholt
695a69029f * sisChooseRenderState doesn't depend on _NEW_TEXTURE at all.
* Clean up definition of _SIS_NEW_RENDER_STATE.
2004-06-09 04:58:03 +00:00
Dave Airlie
e5a916d5b9 make rm for common not complain 2004-06-09 02:44:14 +00:00
Dave Airlie
9e9feacb43 remove depend on clean 2004-06-09 02:43:26 +00:00
Dave Airlie
37a94995cf fix bug with emitting spec/fog report by Eric Anholt, this isn't the prettiest
fix but it does work
2004-06-09 02:29:22 +00:00
Brian Paul
0590895ea7 fix parse error in sign of exponents (bug 968323) 2004-06-08 15:20:23 +00:00
Dave Airlie
7c381a267a Fix rectangular textures on i830 - well texrect at least 2004-06-08 10:21:59 +00:00
Eric Anholt
e84f77be21 * Convert to use t_vertex.c instead of sis_vb.[ch]
* Don't dispatch vertices directly to MMIO; queue them up in dma-like buffers
  first.  This makes things more uniform between AGP and MMIO paths, cleans up
  some locking ugliness, and makes the driver look more like other drivers.
* Don't use the AGP Cmd buffer provided by the server.  Instead allocate one in
  the client, which avoids the need for lots of synchronization stuff.
* Mark some MMIO accesses volatile that should have been.
* Disable the AGP submission path by default (agp_disable=true) due to
  unresolved issues in the new code.  The old code had its own (serious) errors
  with AGP, so this is not really a step backwards.
2004-06-08 09:19:17 +00:00
Daniel Borca
a94185474d corrected a bug wrt point_size 2004-06-08 06:08:56 +00:00
Eric Anholt
06668ed20a Clean a little whitespace that's been bothering me. 2004-06-08 04:38:33 +00:00
Ian Romanick
7c46033130 Fix up some remaining include issues. Replace Xmalloc / Xfree with
_mesa_malloc / _mesa_free.  Replace Bool with GLboolean.
2004-06-07 21:23:12 +00:00
Ian Romanick
03d7596b84 The required DDX and DRI version numbers were switched. This went unnoticed
on several drivers (i.e., R200, Radeon, R128, Unichrome) becuase the
required DRI and DDX versions were 4.0.0.  Mach64 was already fixed.
2004-06-07 20:18:43 +00:00
Eric Anholt
635ba1565c Add NEW_INTERFACE bits. 2004-06-07 19:13:18 +00:00
Dave Airlie
1312498709 fix all those warnings 2004-06-07 13:26:05 +00:00
Dave Airlie
f9b107d876 use the mesa defines 2004-06-07 12:51:05 +00:00
Dave Airlie
6fc70e87ed oops fix a bug I introduced 2004-06-07 12:35:38 +00:00
Dave Airlie
cbf863ee71 fix the versions 2004-06-07 11:58:59 +00:00
Daniel Borca
2c161cf395 small corrections 2004-06-07 06:03:08 +00:00
Dave Airlie
edea87529e make endian code work on BSD 2004-06-07 00:29:40 +00:00
Dave Airlie
4ffbb81bd3 Remove use of X windows include 2004-06-06 23:32:12 +00:00
Ian Romanick
e1a7f31c2b Remove the rest of the need for glxclient.h and remove it from the tree. 2004-06-06 02:20:20 +00:00
Ian Romanick
75046c5e59 Remove drivers that have not been converted to the new interface from
the DRI builds.
2004-06-06 02:19:24 +00:00
Ian Romanick
a704e44f0a Bool may not be available when DRI_NEW_INTERFACE_ONLY is defined. 2004-06-06 01:36:30 +00:00
Ian Romanick
45e7b47d56 Enable use of new DRI interface in Unichrome driver. 2004-06-05 00:48:48 +00:00
Ian Romanick
e3a07ba609 Start to "modernize" the driver. 2004-06-04 22:43:52 +00:00
Ian Romanick
e3789ebe7d Replace 'Display *' with '__DRInativeDisplay *'. 2004-06-04 17:31:46 +00:00
Ian Romanick
98e7d810e1 Enable GL_EXT_blend_subtract and GL_NV_blend_square.
GL_EXT_blend_subtract was already enabled via GL_ARB_imaging, but now
one of the added modes is supported in hardware.  GL_NV_blend_square
was tested with progs/tests/blendsquare on an Rage128 Pro with PCI ID
1002:5046.  I know there are some differences with some versions of
the chip.
2004-06-04 00:46:23 +00:00
Jon Smirl
d672f38709 Redo of removing __driRegisterExtensions(). I accidentally undid the previous check in. 2004-06-03 23:30:33 +00:00
Ian Romanick
82a5581089 Enable use of new DRI interface in Rage128 driver. 2004-06-03 23:16:58 +00:00
Roland Scheidegger
4d8c0398f1 fix minor signedness issue in assertion 2004-06-03 20:53:27 +00:00
Ian Romanick
da1766f12f Remove fill_in_modes and use driFillInModes instead. 2004-06-03 19:08:36 +00:00
Ian Romanick
7439605697 Add a new function, driFillInModes, that is to be used by drivers to
create the set of support __GLcontextModes.  This should replace the
current driver-specific fill_in_modes functions.
2004-06-03 18:57:18 +00:00
Keith Whitwell
173bc32195 Fix problems when sizeof(Node) != sizeof(float) 2004-06-03 13:52:10 +00:00
Daniel Borca
93c91c3863 masked out unsupported glBlendColor (some games check only the proc addr) 2004-06-03 07:14:27 +00:00
Jon Smirl
8f980b0e74 Open/Close FullScreen die. unichrome and savage implemented, code is ifdef'd out 2004-06-03 02:34:31 +00:00
Jon Smirl
ba3d643c49 kill __driRegisterExtensions(), none of the functions did anything 2004-06-03 01:56:07 +00:00
Ian Romanick
5b98ada880 driCheckDriDdxDrmVersion uses a function that is not available to
drivers when DRI_NEW_INTERFACE_ONLY is defined.  #ifndef it away in
that situation.

Add a new function, driCheckDriDdxDrmVersion2, that is passed in the
version information that is already supplied to __driCreateNewScreen.
Part of the reason that information is supplied to
__driCreateNewScreen is so that the driver doesn't have to make those
calls to get it!

Modify all drivers that support the new interface to use the new
function instead of the old.  As soon as all drivers support the new
interface, driCheckDriDdxDrmVersion can be removed.
2004-06-02 22:48:03 +00:00
Jon Smirl
ffb36d57a5 Removed need for sarea.h, various touch ups to get rid of type mismatches. 2004-06-02 22:45:00 +00:00
Ian Romanick
1960182ece Require libGL API version 20040602, which actually exports
__glXGetDrawableInfo.  Make sure driCreateNewDrawable sets
pdraw->private to NULL for all failure paths.
2004-06-02 22:24:00 +00:00
Ian Romanick
5c113461df Make sure USE_NEW_INTERFACE is defined if DRI_NEW_INTERFACE_ONLY is
defined.
2004-06-02 22:12:24 +00:00
Roland Scheidegger
48ccaf2009 add support for more than 2 texture units (max 6, default 4). use hang workarounds only for r200, not derivatives. 2004-06-02 22:09:11 +00:00
Roland Scheidegger
2665a4e74c change GL_ARB_texture_env_crossbar implementation behaviour to OGL 1.4 core specification instead of extension specification (undefined behaviour instead of disabled blending if not enabled texture units are referenced). Fix minor signedness bug. 2004-06-02 21:40:03 +00:00
Ian Romanick
749e842953 Replace Bool with GLboolean. 2004-06-02 20:46:03 +00:00
Ian Romanick
bb45fec074 Minor changes to make it work better outside X. "Success" is replaced
by explicit 0.  Several functions that are not needed with
DRI_NEW_INTERFACE_ONLY are blocked with '#ifndef DRI_NEW_INTERFACE_ONLY'.
Some further work is still required to make it build without any X
include files, though.
2004-06-02 20:45:19 +00:00
Ian Romanick
6632a751be Replace use of XID with __DRIid. 2004-06-02 20:41:16 +00:00
Ian Romanick
e3490edc59 Re-import from DRI tree. 2004-06-02 17:48:43 +00:00
Ian Romanick
18a5ecec89 DRI_NEW_INTERFACE_ONLY is now the only support way to build in the
Mesa tree.  If you need a driver that supports the old libGL/DRI
inteface, it must be built in the DRI tree.
2004-06-02 17:48:16 +00:00
Ian Romanick
318aa84099 XF86DRIDestroyContext, XF86DRICreateDrawable, and
XF86DRIDestroyDrawable are all called directly from DRI drivers using
the new interface.  Therefore, prototypes, using available datatypes,
must be available in dri_interface.h.  Since the prototypes are
available there, xf86dri.h is no longer needed for
DRI_NEW_INTERFACE_ONLY builds.
2004-06-02 17:37:09 +00:00
Brian Paul
9fcb9c3ac7 fix stencil index bug (#964704) 2004-06-02 15:51:31 +00:00
Ian Romanick
c06b25594e Replace drmHandle, drmContext, drmDrawable, drmMagic and related types with
drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.
2004-06-02 05:07:10 +00:00
Brian Paul
d203091d20 Check for NULL texture object when choosing texture sampler. Fixes segfault when fragment program references an incomplete texture 2004-06-02 00:16:42 +00:00
Ian Romanick
a4436a8f44 Fix dumb mistake from a previous commit. __driCreateScreen is now
properly block with '#ifndef DRI_NEW_INTERFACE_ONLY'.
2004-06-01 23:14:19 +00:00
Roland Scheidegger
7a6eda7137 add support for GL_ARB_texture_env_crossbar 2004-06-01 23:04:10 +00:00
Ian Romanick
60b0e12830 Convert 'Display *' to '__DRInativeDisplay *'. Only portions of the
interface that are not *strictly* part of the old interface were
changed.  Replace GetDrawableInfo type (dri_util.h) with
PFNGLXGETDRAWABLEINFOPROC (dri_interface.h).  Wrap __driCreateScreen
(in drivers that use the new interface) with '#ifndef
DRI_NEW_INTERFACE_ONLY'.
2004-06-01 20:24:59 +00:00
Ian Romanick
ec032cb17b Fix a couple issues related to GetDrawableInfo. In the new DRI
interface, it must be available from libGL, and the the typedef in
dri_util.h was wrong.
2004-06-01 19:20:12 +00:00
Ian Romanick
0521ab46c1 Replace occurances of GLXDrawable and Drawable with __DRIid. 2004-06-01 17:06:09 +00:00
Ian Romanick
fabe2b9ba3 Replace all occurances of XF86DRIClipRect (and related typedefs) with
drm_clip_rect_t.
2004-06-01 16:38:56 +00:00
Ian Romanick
a249ad756f Fix a couple typos that prevent building with DRI_NEW_INTERFACE_ONLY. 2004-06-01 15:42:14 +00:00
Eric Anholt
0c0f5c2b72 Remove unnecessary #include "mach64_common.h" which breaks the build for me. 2004-06-01 02:00:25 +00:00
Eric Anholt
f016e2509e Missed in last commit:
Build fixing for FreeBSD.  GNU make is installed as gmake, so make a MAKE
variable (defaults to "make") and use that.  Use the MKDEP and MKDEP_OPTIONS
more.  Our shell isn't bash, so change the instances of ">& /dev/null" to a more
compatible "> /dev/null 2>&1".
2004-06-01 00:39:34 +00:00
Eric Anholt
2fb5d15ce3 Build fixing for FreeBSD. GNU make is installed as gmake, so make a MAKE
variable (defaults to "make") and use that.  Use the MKDEP and MKDEP_OPTIONS
more.  Our shell isn't bash, so change the instances of ">& /dev/null" to a more
compatible "> /dev/null 2>&1".
2004-06-01 00:06:14 +00:00
Eric Anholt
c1311d80bd Use MKDEP make variables instead of hard-coding. 2004-05-31 22:34:49 +00:00
Daniel Borca
e35282cc13 reworked FXT1
minor fixes to fxMesa
2004-05-31 06:24:36 +00:00
Dave Airlie
54f4f44843 fixup mach64 for newer build/types 2004-05-31 00:58:34 +00:00
Brian Paul
11b3028e7b check for null pointer in Fake_glXCreateGLXPbufferSGIGIX() (bug 961376) 2004-05-29 14:41:52 +00:00
Adam Jackson
2ac56c66d2 use new interface for tdfx (phase 2) 2004-05-28 19:27:33 +00:00
Adam Jackson
cd630037a2 Fix type conflict. 2004-05-28 16:50:42 +00:00
Roland Scheidegger
1071162b36 update so it compiles again (untested driver path!). Basically ported changes from r200_maos_arrays.c cvs rev. 1.3-1.5. 2004-05-28 14:55:07 +00:00
Roland Scheidegger
957b734322 remove never finished verts path (r200_maos_vbtmp.h, r200_maos_verts.c) and unused R200_OLD_PACKET macro 2004-05-28 14:50:36 +00:00
Ian Romanick
8cdccc82d7 Define PFNGLXGETMSCRATEOMLPROC so that DRI will build without including
glxext.h.
2004-05-27 22:49:12 +00:00
Ian Romanick
b3981ab6e6 Move dri_util.[ch] and glcontextmodes.[ch] from dri_client to common. 2004-05-27 22:31:06 +00:00
Roland Scheidegger
aaaf38d372 change some explicit references to texture units 0/1 to unit < MaxTextureUnits (Andreas Stenglein, Ronny Vindenes) 2004-05-27 16:56:47 +00:00
Ian Romanick
d44e9e39da Build the fogcoord demo. 2004-05-27 15:21:44 +00:00
Ian Romanick
7867799c72 Modify glprocs.h to have two tables instead of one. The first table
is just a huge string will all the function names in it.  The second
table contains offsets into the first table instead of pointers to
strings.
2004-05-27 00:05:13 +00:00
Ian Romanick
c1d455f582 Convert all calls using _glapi_Dispatch to use the new GL_CALL macro. 2004-05-27 00:03:53 +00:00
Ian Romanick
77bbbb3759 Minor code simplification. 2004-05-26 17:12:56 +00:00
Ian Romanick
63b2e426ac Test the overhead of just calling a GL function. The Python script is
a helper to do multiple runs and compare the results.
2004-05-26 16:38:38 +00:00
Brian Paul
e6e0ba781b only use simple_z_textured_triangle if depthBits <= 16 2004-05-25 22:29:52 +00:00
Ian Romanick
3953e12890 Added a couple fog coordinate related register defines. 2004-05-25 21:14:47 +00:00
Ian Romanick
a1cafadb26 Modify the generate assembly code to not use global registers %g2,
%g3, %g6, or %g7.  This should eliminate the warnings about global
registers used without a ".register" directive.
2004-05-25 16:51:56 +00:00
Daniel Borca
680d390550 oops 2004-05-25 14:19:30 +00:00
Daniel Borca
6db87bc889 FXT1 texture compression (initial draft) 2004-05-25 07:22:41 +00:00
Ian Romanick
fb4449033b Fixed a bug that caused every dispatch function to call glNewList. 2004-05-24 23:05:09 +00:00
Felix Kuehling
0f8a2718a3 WAIT_IDLE_EMPTY in savageSwapBuffers until real frame throttling is possible. 2004-05-24 22:26:49 +00:00
Eric Anholt
bbd557fc53 Clean up some warnings by making sis_fatal_error a macro, and let it take an
argument of a message to print.  Make some assert(0)s use sis_fatal_error.
2004-05-24 20:48:27 +00:00
Eric Anholt
8c805fed0f Add missing sisInitDriverFuncs call. Fixes segfault. 2004-05-24 20:09:59 +00:00
Ian Romanick
958103c77c Generates assembly dispatch stubs for SPARC. Generates different output
than glsparcasm.py, but the assembled code should be the same.  The seems to
only work with GCC version >= 3.0.  The older preprocessor doesn't like the
embedded # in the GLOBL_FN macro.  On the SPARC system I used, /ccs/bin/as
didn't like the @function, it would only accept #function.
2004-05-24 17:48:21 +00:00
Dave Airlie
257e474474 stop crash when debugging 2004-05-24 10:43:43 +00:00
Roland Scheidegger
9e29536f28 use OGL 1.1 color logic ops in addition to GL_EXT_blend_logic_op 2004-05-21 17:03:38 +00:00
Brian Paul
cbde37a31c fix bug #957792 (swap buffers), plus misc clean-ups 2004-05-21 15:57:11 +00:00
Brian Paul
27eb8fa35a remove duplicate GLX_DRAWABLE_TYPE token, sorted tokens by enum value 2004-05-21 15:51:13 +00:00
Roland Scheidegger
7225a7292a (Dieter Nuetzel) fix typo in help screen 2004-05-21 14:51:33 +00:00
Brian Paul
254d519c6a s/core/main/ 2004-05-21 14:48:58 +00:00
Roland Scheidegger
1bf9499ee1 fix constant texture environment color setup for texture units > 0 2004-05-21 14:20:26 +00:00
Ian Romanick
ad447964e0 s/sop/rop/ in a couple places to fix some bugs. Added some parameter
information to several functions.
2004-05-21 03:51:55 +00:00
Brian Paul
4a54ace195 lots of updates 2004-05-20 22:27:59 +00:00
Brian Paul
1d91a0b908 updated URL 2004-05-20 22:27:30 +00:00
Ian Romanick
0c963b3142 Added all of the missing ARB extensions. Added all the enums and
types for all core versions and ARB extensions.  Converted all tabs to
spaces.
2004-05-20 21:24:27 +00:00
Daniel Borca
a863d4bffb doc update; minor changes 2004-05-20 06:11:16 +00:00
Roland Scheidegger
033728555c Add support for GL_EXT_blend_[func|equation]_separate. Fix GL_EXT_blend_color. Remove support for GL_EXT_blend_logic_op (cannot be supported together with blend_equation_separate unless a software fallback would be added). 2004-05-20 00:31:26 +00:00
Roland Scheidegger
a671fea404 add check if drm is new enough for packet R200_EMIT_RB3D_BLENDCOLOR 2004-05-20 00:23:30 +00:00
Roland Scheidegger
b6933b6811 add missing R200_RB3D_BLENDCOLOR register 2004-05-20 00:19:48 +00:00
Ian Romanick
a9d033c460 Added some in-code documentation. Modifed glParameter to be a
subclass of glItem.
2004-05-19 23:33:08 +00:00
Ian Romanick
d54549df23 Re-ordered categories. Added extension number information. 2004-05-19 19:12:05 +00:00
Daniel Borca
fc332f008c added GL_NV_blend_square
fixed alpha blending modes for Napalm
minor fix in compressed texture aspectratio adjust
2004-05-19 08:16:44 +00:00
Ian Romanick
73f59b01ea New scripts for processing the XML version of APIspec. Mail is being
sent to mesa3d-dev with a more detailed description.
2004-05-18 18:33:40 +00:00
Daniel Borca
3e15e861b2 added some core-level extensions 2004-05-18 07:13:54 +00:00
Brian Paul
b7460bb62a fixed some bogus array enable tests (Soju Matsumoto) 2004-05-17 14:19:57 +00:00
Brian Paul
3ef972f538 Replaced 'core' with 'main'.
Other minor updates.
2004-05-16 22:07:02 +00:00
Brian Paul
de4b3bb776 minor doxygen updates 2004-05-14 23:11:53 +00:00
Brian Paul
d72834dd0b Minor fixes/optimizations to type conversions in draw_depth_pixels().
Fix off by one errors in a few assertions.
2004-05-14 14:39:59 +00:00
Roland Scheidegger
b9cbd52724 Fix GL_MIN and GL_MAX blend equations (set blend factors accordingly). Fix errors when blending is disabled (set blend equation and function to default values). 2004-05-14 13:01:08 +00:00
Brian Paul
d359f96a18 cast driHwLock assignment 2004-05-13 18:24:20 +00:00
Brian Paul
f4bc136273 silence warning in assignment to gp.value 2004-05-13 18:09:53 +00:00
Brian Paul
7d749ec9be fix parameters to StoreImage() 2004-05-13 18:07:30 +00:00
Brian Paul
defb035b6c Another pass at implementing byte-swapped texture formats.
More code re-use this time.
Most formats now tested/debugged with new packedpixels.c test.
2004-05-13 15:26:51 +00:00
Brian Paul
46bc595969 Test program to check that packed pixel formats work as expected with
glTexImage2D.  All samples should appear identical.  Press f/F to change
the internal texture format.
2004-05-12 23:05:21 +00:00
Brian Paul
db862e4d4c GL_BGR can't be used with the packed types, according to the GL spec. Enforce such. 2004-05-12 22:54:47 +00:00
Brian Paul
f35b47fa62 some component ordering bugs in extract_float_rgba() 2004-05-12 21:53:34 +00:00
Erdi Chen
ba8788fee7 Fixed code that has computed incorrect number of modes. 2004-05-12 18:37:11 +00:00
Ian Romanick
c318d50717 Added support for GL_EXT_blend_equation_separate and
GL_NV_blend_square.  Fix a bug in the way the GL_MIN and GL_MAX
blending modes were handled.
2004-05-12 16:36:30 +00:00
Ian Romanick
0e22d598e6 Fixed a bug that showed up in several multitexturing games (Quake3 and
ThinkTanks were tested) that was related to the recent 4 TMU changes.
Removed the un-needed TexBlendColorPipeNum field from the hardware
context.
2004-05-12 16:29:55 +00:00
Brian Paul
f1cfb4b7a7 fix compiler warnings (Jerome Glisse) 2004-05-12 15:29:36 +00:00
Brian Paul
2e66f7eef7 fix parameters to StoreImage calls 2004-05-12 15:05:53 +00:00
Brian Paul
71e373f186 remove last remnants of NEWTEXSTORE stuff 2004-05-12 15:02:49 +00:00
Brian Paul
5726a238d4 remove the last line of the previous patch 2004-05-12 14:51:51 +00:00
Brian Paul
86c7541f9b fix red/green/blueBits typos 2004-05-12 14:48:39 +00:00
Brian Paul
751c9d096d obsolete in favor of regular Makefiles 2004-05-12 14:04:29 +00:00
Brian Paul
8813cb56b0 yank bgr233 texformat. minor comment updates. 2004-05-12 14:00:36 +00:00
Daniel Borca
e61d60eb81 minor fixes 2004-05-12 05:36:24 +00:00
Brian Paul
a156b49800 Added big-endian texture formats.
Moved CI->RGBA palette lookup into texel fetch function.
2004-05-12 01:50:30 +00:00
Ian Romanick
939f6a724e Added a 4th square to the output. Expanded the message written to the
console.
2004-05-11 19:59:13 +00:00
Ian Romanick
5f6691f371 Added simple EXT_blend_minmax test. 2004-05-11 19:57:58 +00:00
Ian Romanick
d2f18ec6fa Added simple NV_blend_square test. 2004-05-11 17:48:33 +00:00
Ian Romanick
366a27d2b9 Fix a possible segfault caused by the SGI_make_current_read changes. 2004-05-11 16:17:49 +00:00
Brian Paul
4e0d575c64 Don't call calculate_derived_texenv() from in _mesa_TexEnv().
Minor code rearranging.
2004-05-10 22:37:20 +00:00
Brian Paul
d6693c4294 s/GLX_PIXMAP_BIT_SGIX/GLX_PBUFFER_BIT_SGIX/ 2004-05-10 22:07:57 +00:00
Keith Whitwell
352d4dbfb2 Add EXT_vertex_cull support to mesa 2004-05-10 18:16:03 +00:00
Daniel Borca
39fe9a7fe3 fixed bugs in fxddtex.c
cleaned up win32 definition files
2004-05-10 07:42:26 +00:00
Jon Smirl
1cbee9c159 Fix solo build, add missing #ifdef NEW_INTERFACE 2004-05-09 04:38:42 +00:00
Felix Kuehling
302781f6cc Added german translation to option texture_units. 2004-05-08 10:08:21 +00:00
Eric Anholt
c753f367eb Don't mix variable definitions and other statements (fixed build on old
compiler).
2004-05-08 07:48:13 +00:00
Ian Romanick
c94a96bae4 Add support for GLX_SGI_make_current_read. 2004-05-07 22:46:37 +00:00
Ian Romanick
3d769b81fa Warning clean-ups. 2004-05-07 22:43:52 +00:00
Ian Romanick
216d980d53 Uses either the GLX_SGI_make_current_read or GLX 1.3 interface,
depending on which is available.
2004-05-07 18:20:43 +00:00
Ian Romanick
ed046bf842 Enable use of new DRI interface in i830 driver. 2004-05-07 18:04:23 +00:00
Ian Romanick
d81d2aeca8 Add support for the 3rd and 4th texture units. The actual number of
available units is configurable via the texture_units option.
2004-05-07 17:30:31 +00:00
Ian Romanick
f539860f79 Added a config option to set the number of available texture units. A
German translation is still needed.
2004-05-07 17:29:48 +00:00
Daniel Borca
4a1d4a25e2 documentation update 2004-05-07 06:00:53 +00:00
Ian Romanick
54f1027362 Refactor "classic" texture environments to be implemented in terms of
ARB_texture_env_combine state.  Add support for
ARB_texture_env_crossbar.  Combiner state is only emitted for operands
that need to be emitted for the combine operation.
2004-05-07 00:33:12 +00:00
Brian Paul
4ab8b77520 fix rectangle texture clamping and border-related code 2004-05-06 20:28:26 +00:00
Brian Paul
1229100703 Added menu options to test border modes and linear/nearest filtering.
Adjust texcoords so we always have to sample the border.
Other misc changes.
2004-05-06 20:27:32 +00:00
Ian Romanick
eec8dbd512 Remove a debug printf that should not have been left in. 2004-05-05 21:32:16 +00:00
Ian Romanick
cd6ca58c3f Modified to use vertex arrays. Vertex arrays and immediate mode calls
are toggled with the 't' key.
2004-05-05 20:17:19 +00:00
Ian Romanick
95a0bd6762 Added support for the 3rd texture coordinate for cubemaps and 3D
textures.  progs/demos/cubemap and progs/demos/stex3d seem to work
correctly at all tcl_mode settings.  x86 / SSE codegen is currently
disabled.
2004-05-05 20:16:17 +00:00
Brian Paul
4045b6e5b8 don't need auto mipmaps 2004-05-05 00:28:17 +00:00
Brian Paul
9c1b13ff6a fix a few bugs when using GL_REDUCE convolution mode 2004-05-05 00:28:01 +00:00
Brian Paul
07cc9af601 documentation for TexImage code changes 2004-05-05 00:02:23 +00:00
Brian Paul
cb40ebd8a2 added -c option to exercise convolution of glTexImage2D 2004-05-04 23:57:12 +00:00
Brian Paul
2b012578ee fix a bug on the convolution path 2004-05-04 23:56:24 +00:00
Brian Paul
71f88aeb10 obsolete 2004-05-04 15:17:44 +00:00
Brian Paul
07281d37a7 remove unneeded line 2004-05-04 15:12:22 +00:00
Brian Paul
bdd15b5749 Fix minor warnings found with g++. 2004-05-04 15:11:06 +00:00
Daniel Borca
33ffbd1c58 texture compression: getting warmer 2004-05-04 06:27:06 +00:00
Dave Airlie
abe4a72cfc add r200 x86 sources 2004-05-04 00:12:22 +00:00
Dave Airlie
b05d87d6f5 use X86 sources in X86 build, use none in other 2004-05-04 00:10:24 +00:00
Dave Airlie
0a8b528bf5 switch to X86_SOURCES 2004-05-04 00:09:47 +00:00
Adam Jackson
4d6f05c971 Skeletal fallback-only DRI driver. Initial checkin, not quite working yet. 2004-05-03 23:33:21 +00:00
Dave Airlie
e25dd06b4a remove this use the one from the DRM 2004-05-03 11:31:29 +00:00
Dave Airlie
898c03a573 add linux-dri-x86 target 2004-05-03 11:30:37 +00:00
Dave Airlie
e8e5b41862 the config is included by the Makefiles that includes this file... 2004-05-03 11:29:19 +00:00
Dave Airlie
47244a8181 add asm sources 2004-05-03 11:28:35 +00:00
Dave Airlie
d388f64c0e clean up the common objects.. 2004-05-03 11:01:38 +00:00
Daniel Borca
5f0b6c9f8f unbloat namespace 2004-05-03 07:35:57 +00:00
Dave Airlie
aa9767c683 get rid of last few XF86DRIClipRect 2004-05-03 06:54:54 +00:00
Dave Airlie
f7423f4628 fix up build for solo/dri 2004-05-03 06:49:40 +00:00
Dave Airlie
79518b6f37 DRM_SOURCE_PATH is in default 2004-05-03 06:48:33 +00:00
Brian Paul
edc09004fd fix StoreImage calls, remove dead code (Adam Jackson) 2004-05-02 14:32:44 +00:00
Brian Paul
80fc5ea53e restored _mesa_rescale_teximage2d() 2004-05-02 14:30:46 +00:00
Brian Paul
883e7a5906 minor vertex/fragment program tweaks 2004-05-01 18:28:49 +00:00
Daniel Borca
c5cb215e3e FXT1: getting warmer 2004-04-30 09:48:21 +00:00
Alan Hourihane
ef5c82bd02 If we can't allocate the rowimage - bail 2004-04-30 09:44:22 +00:00
Keith Whitwell
739f50f542 Define GLX_DIRECT_RENDERING in Makefile.template 2004-04-30 09:15:58 +00:00
Keith Whitwell
69ab4fec12 AMD64 changes from Ronny V. Vindenes. 2004-04-30 08:29:04 +00:00
Ian Romanick
4d46e4b26a Remove several files that are only used in the XFree86 / Xorg libGL.so.
They are *not* linked into the *_dri.so drivers.
2004-04-29 22:16:29 +00:00
Keith Whitwell
74d563cdfb Allow *_dri.so to build in Mesa tree with the 'linux-dri' target. 2004-04-29 12:23:39 +00:00
Daniel Borca
c35dcfcf0a FXT1 preparations 2004-04-29 09:01:41 +00:00
Daniel Borca
af503f3438 updated makefiles 2004-04-28 08:39:45 +00:00
Ian Romanick
eb2281f8c4 Use the dispatch table directly instead of calling GL functions. 2004-04-27 18:38:23 +00:00
Ian Romanick
d100dfbf27 Remove include of texutil.h to get build working. 2004-04-27 18:37:13 +00:00
Brian Paul
65fdeaca6c updated other makefiles 2004-04-27 13:41:56 +00:00
Brian Paul
8f04c12e0a Removed the old teximage code.
Moved all code related to specific texture compression modes into
new texcompress_s3tc.c and texcompress_fxt1.c files (but not implemented).
2004-04-27 13:39:20 +00:00
Brian Paul
186d4d8cf4 added pointer to Vincent (OpenGL ES implementation) 2004-04-27 12:55:08 +00:00
Daniel Borca
bc04d041eb transfer routines for compressed formats (avoid SEGFAULT, also prepare for external packers) 2004-04-27 05:59:52 +00:00
Daniel Borca
5be4c27b28 accomodate newtexstore
fixed wgl interface for fxMesa
2004-04-26 14:23:33 +00:00
Alan Hourihane
18514500c4 remove DitherValues 2004-04-26 12:45:06 +00:00
Alan Hourihane
462183fe4c bring over build fixes from stable branch 2004-04-26 10:10:22 +00:00
Brian Paul
08fa6de850 s/-mv8/-mcpu=ultrasparc/ (bug 941338) 2004-04-25 15:18:36 +00:00
Brian Paul
ac0cfee885 fix HP-UX typo (bug 941576) 2004-04-25 15:13:56 +00:00
Brian Paul
41318937ef call drmUnmapBufs() in mgaDestroyScreen (Tilman Sauerbeck) 2004-04-24 14:55:02 +00:00
Brian Paul
f7b4e0d376 minor fixes for entrypoint name mangling 2004-04-23 20:33:07 +00:00
Ian Romanick
e946688eda Convert R200 driver to use the t_vertex interface. 2004-04-23 20:20:07 +00:00
Brian Paul
199972cef0 move #define for GL_DOUBLE, to put enums in right order 2004-04-23 18:00:00 +00:00
Brian Paul
f2f3350774 GL_DOUBLE doesn't follow GL_FLOAT, fix indexing (Keith Harrison) 2004-04-23 17:58:06 +00:00
Brian Paul
948dff8932 init mgaScreen->irq (Tilman Sauerbeck) 2004-04-23 17:53:28 +00:00
Brian Paul
6d460af6af Added ctx->Vertex/FragmentProgram._Enable flags. Set when vertex/fragment
program is enabled AND the currently bound program is valid.
Check _Enable instead of Enable to prevent things from blowing up
when someone calls glEnable(GL_VERTEX_PROGRAM_ARB) without actually
defining a program.
2004-04-23 14:16:46 +00:00
Brian Paul
384800fe12 assorted fixes 2004-04-23 14:14:04 +00:00
Keith Whitwell
180e28e6d4 Add fps output 2004-04-23 14:06:02 +00:00
Brian Paul
031e86b597 remove some errant code from previous check-in 2004-04-23 13:58:44 +00:00
Brian Paul
fe4b966293 new CYGWIN docs from Eric Lassauge 2004-04-23 13:13:30 +00:00
Brian Paul
6e167151f9 s,CHAN_BITS/8,sizeof(GLchan), 2004-04-22 23:51:15 +00:00
Roland Scheidegger
6d3dc3b8d6 fix bracket at wrong place 2004-04-22 20:04:08 +00:00
Brian Paul
580548d046 added CYGWIN support 2004-04-22 16:16:42 +00:00
Keith Whitwell
7bd5343990 Fix order of EMIT_4UB_4F declarations 2004-04-22 08:14:48 +00:00
Brian Paul
66fdc3c948 added floattex.c to test floating point textures 2004-04-22 01:10:09 +00:00
Brian Paul
5b45c11486 use FetchTexelf() in GetTexImage() to return float textures correctly 2004-04-22 01:08:36 +00:00
Brian Paul
3623733472 fix some include file glitches 2004-04-22 00:54:53 +00:00
Brian Paul
2fae1bb6df minor clean-ups 2004-04-22 00:47:28 +00:00
Brian Paul
362f1df210 obsolete 2004-04-22 00:42:38 +00:00
Brian Paul
f959f6e1dc New glTexImage code.
The gl_texture_format struct now has a StoreTexImageFunc that's called
by glTex[Sub]Image[123]D to convert the user's texture data into the
specific texture format layout.  Now it's much easier to add new texture
formats (like the 16/32-bit floating point formats).
The texutil.[ch] and texutil_tmp.h files are obsolete.
2004-04-22 00:27:31 +00:00
Brian Paul
05a6f2fd48 Fix up some assorted issues with initialization of vertex program registers.
Some need to be set per-vertex, other per-primitive.  Cleared that up.
Only need to init temp/result registers if executing an NV vertex program.
2004-04-21 18:09:14 +00:00
Brian Paul
6164ae2b5a only init temp regs to zero if executing NV fragment program 2004-04-21 17:51:21 +00:00
Brian Paul
c45b7364da check return values of _swrast_CreateContext, etc 2004-04-21 16:11:27 +00:00
Brian Paul
f693b1dc2e removed non-existant arbfpwpos.c, added UTIL_FILES target 2004-04-20 23:25:47 +00:00
Keith Whitwell
74339bf471 Add printing for recently added opcodes. 2004-04-20 13:03:36 +00:00
Alan Hourihane
485438e2be add SciTech's GLDirect driver for Windows.
This code is donated to Mesa which allows the usage of
a Direct3D layer (DX7, DX8, DX9 or complete software fallback).

No build system exists for this code yet, that will come.....
2004-04-20 11:13:11 +00:00
Keith Whitwell
319f5fd5ec Simplify last fix slightly, apply to vtx paths as well. 2004-04-20 10:28:15 +00:00
Keith Whitwell
30a8a0b8fa When upgrading copied vertices, distinguish between an attribute
entering a vertex for the first time and one which was already present
but increasing its size.  Fixes Brian's normal.c bug.
2004-04-20 10:18:33 +00:00
Brian Paul
8be72c5b5d apply texgen/texture matrix in glRasterPos 2004-04-19 23:13:36 +00:00
Brian Paul
adcb228fed linux-solo-ia64 config (Stephane Marchesin) 2004-04-19 22:23:10 +00:00
Brian Paul
1fc35a44ef glTexEnviv bug fix 2004-04-19 20:26:30 +00:00
Brian Paul
ac96356300 in TexEnv functions, check if pname == GL_TEXTURE_ENV_COLOR and fetch appropriate number of param values 2004-04-19 20:24:49 +00:00
Brian Paul
e63cb85cbc do texcoord projective division in _swrast_span_default_texcoords() 2004-04-19 15:03:16 +00:00
Brian Paul
4697419c43 bug fixes for ARB/NV fragment program texture instructions 2004-04-18 20:23:24 +00:00
Brian Paul
8e048e72c1 check for __ia64__ when setting USE_IEEE 2004-04-18 20:21:16 +00:00
Brian Paul
f4b909bed0 updated instructions for new directory tree and makefile system 2004-04-18 20:17:14 +00:00
Brian Paul
eca88f8019 added missing SHADER_SOURCES to ALL_SOURCES 2004-04-18 20:14:11 +00:00
Brian Paul
51060afb4e hack to use glTexCoord4f and Q variable to test projective texcoords 2004-04-18 20:13:21 +00:00
Brian Paul
d8b82147c3 Audit/fixes for NV/ARB TEX, TXP, TXB, TXD instructions.
Some texture instructions were using wrong LOD.
Fixed interpolate_texcoords() so it doesn't do texcoord projective division
when using a fragment program.  The TXP instruction does that.
2004-04-18 20:11:52 +00:00
Keith Whitwell
c83d09e3b0 Make sure ctx->Driver.NeedFlush is set for Eval-generated attributes. 2004-04-16 08:30:12 +00:00
Keith Whitwell
aa90495915 Make _SAT instructions compile correctly. 2004-04-15 11:20:48 +00:00
Dave Airlie
4d914b80e1 make sure matypes is built 2004-04-15 05:55:26 +00:00
Dave Airlie
5772d998f4 add drm source dir for solo includes 2004-04-15 04:50:20 +00:00
Dave Airlie
85dc9fe543 get the libraries the right way round.. 2004-04-15 01:35:25 +00:00
Ian Romanick
ab37fddbfd Correct the comments about when the bindContext3 / unbindContext3
interface was added.
2004-04-15 01:24:57 +00:00
Dave Airlie
a7abda5820 set default page flipping to zero can be changed in header file 2004-04-15 01:15:38 +00:00
Brian Paul
643020dd82 wrap file in #ifdef USE_TCC, otherwise compilation failes 2004-04-14 23:23:19 +00:00
Brian Paul
06535d239b set CONFIG_NAME = linux-tcc 2004-04-14 21:35:47 +00:00
Keith Whitwell
9a543e5645 new file 2004-04-14 21:20:00 +00:00
Keith Whitwell
6fb235661a Use tcc and the emitted C code from s_fragprog_to_c.c to dynamically compile
and execute fragment programs.  Very limited and experimental, but works
well enough to run arbfplight.c.

	http://fabrice.bellard.free.fr/tcc/

Compile with 'make linux-tcc', being sure to make clean first.
2004-04-14 21:19:34 +00:00
Keith Whitwell
e3b0dde49c Fail if any subdir fails. 2004-04-14 14:41:18 +00:00
Keith Whitwell
f2b3d0828e Hack to get things compiling - include "drm.h" instead of "xf86drm.h".
Need to fix this, or get maybe rid of xf86drm.h which seems redundant
in a standalone build.
2004-04-14 13:32:37 +00:00
Keith Whitwell
6b3780cd83 Link against GL_LIB_DEPS 2004-04-14 13:31:09 +00:00
Keith Whitwell
01e6ff312e Remove mesa.a when making clean 2004-04-14 12:54:31 +00:00
Keith Whitwell
e61df58729 First attempt at building a dri module in this tree
-- make target is linux-dri
	-- will attempt to build i830_dri.so

The object builds but hasn't been tested.
2004-04-14 12:44:07 +00:00
Keith Whitwell
680ec7f851 First pass at support for building DRI drivers in mesa tree. 2004-04-14 12:39:58 +00:00
Keith Whitwell
00e01091ce Don't try to use .c=.o rule on .S files when building mesa.a 2004-04-14 10:26:47 +00:00
Alan Hourihane
3a590805d1 disable under _SOLO build 2004-04-14 08:25:57 +00:00
Daniel Borca
edf4f53c15 documentation updates
Glide3 driver: POINTCAST palette fixes
2004-04-14 08:00:52 +00:00
Dave Airlie
377ced2bf1 Add agpmode to the example config file 2004-04-14 02:14:15 +00:00
Dave Airlie
f833df0781 get agpmode from config file 2004-04-14 02:09:52 +00:00
Dave Airlie
50a8b7b611 Add shader sources for solo build 2004-04-14 02:08:37 +00:00
Dave Airlie
ec5f71d0f3 make solo work like before new makefile merge 2004-04-14 01:40:18 +00:00
Dave Airlie
5d8f7b1197 add agpmode to miniglx config file 2004-04-14 01:33:27 +00:00
Brian Paul
c50d77a7f1 minor tweak for Darwin 2004-04-13 17:35:17 +00:00
Brian Paul
e4e323f388 check for __AMD64__ when setting USE_IEEE (Ronnny Vindenes) 2004-04-13 14:11:20 +00:00
Keith Whitwell
563dadd674 Build a single string containing the generated 'C' code. 2004-04-13 13:43:48 +00:00
Alan Hourihane
bfaca5c649 fix the usage of GLX_MESA_allocate_memory 2004-04-13 09:43:51 +00:00
Daniel Borca
fb7766853d updated Glide driver documentation
fixed SAL/SAR in assyntax.h (NASM)
fixed a bug wrt NULL pointer assignment in t_vtx_api.c
cosmetics to t_vtx_x86.c & t_vtx_x86_gcc.S
enabled STDCALL with codegen (MinGW)
2004-04-13 07:08:34 +00:00
Dave Airlie
4ba589bbf0 make this exactly like XFree86 .. allows 4x to work 2004-04-13 04:58:10 +00:00
Jon Smirl
c0b0b48e5b Add DRM_SOURCE_PATH to make system.
Needed for linux-solo to build
2004-04-13 04:11:32 +00:00
Ian Romanick
231603893d Missed one with the last commit. 2004-04-12 22:41:47 +00:00
Ian Romanick
ee22ed2fb4 Conditionally compile code for x86 specific TNL codegen. This fixes problem
with x86-64 and PowerPC.

Reported by: sublett on #dri-devel.
2004-04-12 22:40:54 +00:00
Alan Hourihane
7873f85684 build fix for VMS 2004-04-11 22:22:23 +00:00
Brian Paul
2db8fe2906 fix minor glitch with GL_DEPTH_COMPONENT textures 2004-04-10 19:50:33 +00:00
Brian Paul
089645799c fix max buffer size test (Kyle Bateman, bug 912828) 2004-04-09 18:11:45 +00:00
Brian Paul
5eb921382f added extern "C" for C++ (bug 930933) 2004-04-09 17:18:22 +00:00
Brian Paul
fb31a01f87 added SPECULAR flag for sprite point functions 2004-04-09 14:13:58 +00:00
Alan Hourihane
d0c8352853 make note about needing to fix the drm driver to enable SAVAGE_CMD_DMA 2004-04-08 23:16:17 +00:00
Brian Paul
32aee1fcc0 added zreaddraw.c 2004-04-08 22:45:02 +00:00
Brian Paul
f3b732f5e5 use MKDEP var 2004-04-08 22:40:57 +00:00
Brian Paul
dd74e36763 added -noprefix option for making DRI drivers 2004-04-08 22:26:22 +00:00
Brian Paul
a3df5990d7 minor fix 2004-04-08 22:25:53 +00:00
Brian Paul
18e9b2e5f8 lots of Makefile updates for new build system 2004-04-08 22:25:29 +00:00
Brian Paul
01eab7c834 move pSAREAPriv declaration to be C-compliant 2004-04-08 22:25:03 +00:00
Brian Paul
62d3309dc2 no depend file 2004-04-08 21:11:12 +00:00
Brian Paul
78c3edc174 don't include GL/gl.h, rely on glheader.h 2004-04-08 21:10:31 +00:00
Brian Paul
bb16df1767 move 'id' declaration so it's C compliant 2004-04-08 21:10:07 +00:00
Alan Hourihane
b303217c14 build fixes 2004-04-08 08:54:23 +00:00
Alan Hourihane
caa5f7e75e remove non-portable whitespace 2004-04-08 08:10:37 +00:00
Brian Paul
9f4ccd8aa0 use new MKDEP, MKDEP_OPTIONS variables 2004-04-07 23:15:26 +00:00
Brian Paul
216aedbbc6 use # comments instead of //, etc (ajax@nwnk.net) 2004-04-07 22:46:40 +00:00
Daniel Borca
cdd6ba3096 removed wfx makefiles 2004-04-07 11:39:33 +00:00
Daniel Borca
d3746ca27e revived linux-glide build process
some small Makefile changes for MinGW & DJGPP
2004-04-07 06:37:50 +00:00
Jouk Jansen
40322e1dfa Committing in .
Correction on last commit (My FTP-server on linux is playing games with
<CR>'s)

 Modified Files:
 	Mesa/src/mesa/drivers/common/descrip.mms
 	Mesa/src/mesa/main/descrip.mms
 	Mesa/src/mesa/shader/arbprogparse.c
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2004-04-05 08:50:36 +00:00
Daniel Borca
8cc059ea64 protected all codegen behind AllowCodegen 2004-04-05 06:49:36 +00:00
Jouk Jansen
8ef874f1a5 Committing in .
Updated OpenVMS compile support due to shader directory.
 Removed <CR>'s in arbprogparse.c

 Modified Files:
 	Mesa/src/mesa/descrip.mms
 	Mesa/src/mesa/drivers/common/descrip.mms
 	Mesa/src/mesa/main/descrip.mms
 	Mesa/src/mesa/shader/arbprogparse.c
 	Mesa/src/mesa/shader/descrip.mms
 	Mesa/src/mesa/swrast/descrip.mms Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2004-04-05 06:12:01 +00:00
Brian Paul
fbb60ede3d update revision history 2004-04-03 16:17:46 +00:00
Brian Paul
29f0190be7 minor corrections 2004-04-03 16:16:16 +00:00
Brian Paul
c2b989f351 minor tweak 2004-04-03 15:28:57 +00:00
Brian Paul
51aa7a93ad for make clean, include tests directory 2004-04-03 15:18:13 +00:00
Brian Paul
3c5d58ccaf shouldn't be in CVS 2004-04-03 15:17:43 +00:00
Brian Paul
347f1d966e reorder 6.0 / 6.0.1 entries 2004-04-02 23:41:18 +00:00
Brian Paul
2501fa1197 merge from 6.0 branch 2004-04-02 23:37:02 +00:00
Brian Paul
8b7da14b82 added some assertions, just to be safe 2004-04-02 22:07:53 +00:00
Brian Paul
ec38d1c22c fix bad array indexing in _save_current_init() that caused context state to get clobbered 2004-04-02 22:07:23 +00:00
Brian Paul
ff1a015ca8 Implement ARB_f_p KIL correctly. 2004-04-02 17:27:46 +00:00
Brian Paul
17355e8b38 add braces to silence warnings 2004-04-02 17:17:00 +00:00
Brian Paul
7feb528905 added FLUSH_CURRENT() call in GetMaterial() calls 2004-04-02 17:01:01 +00:00
Daniel Borca
f17980cdb7 got rid of the notify routine as intermediate step 2004-04-02 09:34:39 +00:00
Daniel Borca
94922b9d2d disabled naughty cheats and protected the choosers behind AllowCodeGen 2004-04-02 09:12:42 +00:00
Daniel Borca
77865f81c9 added codegen'ed choosers 2004-04-02 06:42:04 +00:00
Brian Paul
8b0afe0a67 fix error in rgb332 texel fetch function 2004-04-02 05:10:17 +00:00
Keith Whitwell
96f17ea938 Rename _x86_ symbols to avoid conflict with r200 driver 2004-04-01 17:34:09 +00:00
Keith Whitwell
f41579cd9e Remove test for USE_X86_ASM & HAVE_NONSTANDARD_GLAPIENTRY 2004-04-01 17:32:14 +00:00
Felix Kuehling
d1c1056309 Define empty _tnl_x86_exec_vtxfmt_init if USE_X86_ASM is undefined. This
fixes a missing symbol in libGLcore.a.
2004-04-01 11:10:18 +00:00
Daniel Borca
e5c7f44009 codegen'ed versions of the 2nd level dispatch 2004-04-01 06:53:22 +00:00
Daniel Borca
13822537a7 fine-tuning x86 gcc codegen 2004-03-31 08:31:41 +00:00
Keith Whitwell
b48c575983 dynfn --> _tnl_dynfn 2004-03-31 06:36:30 +00:00
Brian Paul
3e280b3fe7 these are now in the shader/ directory too 2004-03-30 23:05:56 +00:00
Brian Paul
27eb79c9dc these files now live in the shader directory 2004-03-30 22:52:00 +00:00
Keith Whitwell
bcc6a02afc Why are there two copies of this file? 2004-03-30 21:55:14 +00:00
Keith Whitwell
4135601459 Make the output a little more likely to compile... 2004-03-30 16:34:45 +00:00
Brian Paul
a7f52a9ba1 Reorder some code so we don't upset program state when there's a parsing error.
Be sure to assign program.Base.String pointer.
2004-03-30 15:55:10 +00:00
Brian Paul
41d389909b Insert original fragment program instructions as comments.
s/__inline/INLINE/
2004-03-30 15:53:58 +00:00
Brian Paul
ff7d3bb7df added hpux10-static config 2004-03-30 14:56:47 +00:00
Brian Paul
52fb07e2b2 merge from 6.0.1 branch 2004-03-30 14:47:02 +00:00
Keith Whitwell
257c085db9 Amusing utility to print ARB_fp programs as C code 2004-03-30 11:12:37 +00:00
Ian Romanick
d1c38f7472 Add #ifdef protection around the file to prevent DRI build breakage. 2004-03-30 00:23:25 +00:00
Brian Paul
388c455960 fix array indexing for UP4B and UP4UB 2004-03-29 16:34:01 +00:00
Keith Whitwell
eeb5eeb2a6 Accomodate ARB_fp XPD opcode separately from NV_fp's X2D. 2004-03-29 16:01:18 +00:00
Brian Paul
292fa335d6 Take a stab at updating the VMS files. 2004-03-29 14:58:42 +00:00
Brian Paul
788461fc81 fix the build 2004-03-29 14:53:49 +00:00
Keith Whitwell
076c1c2000 new files 2004-03-29 14:01:56 +00:00
Michal Krol
2861e737e8 Moved from src/mesa/main 2004-03-29 11:09:34 +00:00
Keith Whitwell
c8100a02d2 First round of codegen for t_vtx_api.c -- ie the Begin/Vertex/End code.
Enable with env var:  MESA_CODEGEN=t.
2004-03-29 11:05:02 +00:00
Michal Krol
638ea113b9 This wont be needed any more 2004-03-29 11:01:57 +00:00
Michal Krol
cfccb7e0ca Moved to src/mesa/shader and renamed to arbprogram_syn.h 2004-03-29 10:58:58 +00:00
Michal Krol
31df7c92a2 Moved to src/mesa/shader and renamed to arbprogparse.[ch] 2004-03-29 10:57:16 +00:00
Michal Krol
9661d911ee Moved to src/mesa/shader 2004-03-29 10:54:32 +00:00
Daniel Borca
71c7c1feb6 code cleanup heheh 2004-03-29 06:51:41 +00:00
Felix Kuehling
238693544c Forgot to set SAVAGE_NEW_CULL in savageDDEnable_s3d. 2004-03-27 01:04:09 +00:00
Brian Paul
5c2040c768 minor fixes 2004-03-26 23:58:08 +00:00
Brian Paul
1c8e825c2a added GLW_SOURCES for IRIX 2004-03-26 23:57:32 +00:00
Brian Paul
79b372b92a fix some warnings 2004-03-26 23:54:53 +00:00
Brian Paul
7b776de12c tweaks to APP_LIB_DEPS (Dan Schikore) 2004-03-26 23:52:47 +00:00
Felix Kuehling
58fa2a8c50 Enable drawing directly to the (now tiled) front buffer. 2004-03-26 23:27:24 +00:00
Brian Paul
1e50e4046f added .SUFFIXES : .cc line 2004-03-26 22:50:04 +00:00
Brian Paul
533befc8f9 don't try to make GLwMDrawA.c by default since it needs Motif 2004-03-26 21:48:09 +00:00
Brian Paul
df8bc57258 Don't use pushd/popd. 2004-03-26 21:38:45 +00:00
Brian Paul
d6de4d8b33 new Makefile 2004-03-26 20:37:19 +00:00
Brian Paul
46727c7496 Tweaks for make clean / realclean. 2004-03-26 20:31:05 +00:00
Brian Paul
7a5eb9a760 increase MAX_TEXTURE_LOD_BIAS to 11.0 2004-03-26 18:06:23 +00:00
Brian Paul
f132413965 clamp BiasMin, BiasMax to reasonable values 2004-03-26 18:05:36 +00:00
Brian Paul
04800374ee obsolete 2004-03-26 15:48:21 +00:00
Brian Paul
f4044955ca added glw to SRC_DIRS 2004-03-26 15:46:53 +00:00
Brian Paul
57dcbb5d4b added _DEPS lines to specify -L/usr/X11R6/lib 2004-03-26 15:37:26 +00:00
Brian Paul
1f54fc9b82 added OSMESA_DRIVER_OBJECTS and COMMON_DRIVER_OBJECTS 2004-03-26 15:36:33 +00:00
Brian Paul
22388c1902 omit CVS from configs list 2004-03-26 15:31:44 +00:00
Brian Paul
26f334a679 updated Makefile info 2004-03-26 15:20:08 +00:00
Brian Paul
d8944fb6cf Mesa installation script 2004-03-26 15:19:53 +00:00
Brian Paul
de0ee3187c New Makefile system 2004-03-26 15:19:11 +00:00
Brian Paul
a70ad91209 new system configurations 2004-03-26 15:16:35 +00:00
Brian Paul
f262b70d5a tweaks for 64-bit linux configs (Dan Schikore) 2004-03-26 14:21:18 +00:00
Brian Paul
68b38d2751 check for GLX 1.3 during init 2004-03-26 14:17:31 +00:00
Ian Romanick
3623579e43 Make sure drivers don't dereference a NULL pointer if
__driUtilCreateNewScreen returns NULL.
2004-03-26 02:02:48 +00:00
Brian Paul
301e55c6cd merge changes from 6.0.1 branch 2004-03-25 21:55:35 +00:00
Brian Paul
c05658d15e more Darwin tweaks 2004-03-25 21:18:32 +00:00
Brian Paul
77b47bb27b re-order arguments to mklib 2004-03-25 21:17:48 +00:00
Felix Kuehling
f28570679f Recalculate the viewport matrix in savageEmitDrawingRectangle. 2004-03-25 15:19:23 +00:00
Brian Paul
209fee4d33 silence warnings 2004-03-25 14:58:39 +00:00
Michal Krol
bb9054b96d The OpenGL Shading Language Runtime Library for Legacy Target.
Sounds good :)
2004-03-25 13:24:28 +00:00
Daniel Borca
f61487947b small changes (version string) 2004-03-25 09:06:12 +00:00
Brian Paul
16133d3cc1 added linux-x86-opteron (bug 922735) 2004-03-25 01:51:38 +00:00
Brian Paul
d3b09fe29b update my email address 2004-03-25 01:42:41 +00:00
Felix Kuehling
6e963e965c More state management changes:
- Don't lock in savageDDUpdateStatte, don't call savageEmitHwStateLocked
- Need to grab the lock for texture uploads now
- New SAVAGE_NEW_CULL bit in new_state to make sure that culling state and
  raster_primitive are not examined at the wrong times.
2004-03-25 01:16:27 +00:00
Felix Kuehling
adf33a1c6f Make sure hardware culling is disabled for unfilled primitives,
points and lines.
2004-03-24 22:05:25 +00:00
Brian Paul
844585be4c use Driver.WriteMonoRGBAPixels() when possible (Dan Schikore) 2004-03-24 17:17:25 +00:00
Felix Kuehling
e1e439c512 Missing in last commit. 2004-03-24 16:18:05 +00:00
Felix Kuehling
67d0343377 Buffer vertices and emit them in batches. Still using conventional drawing
commands, no vertex DMA.
2004-03-24 16:15:28 +00:00
Brian Paul
fda7215db3 rename class to c_class if using C++ (bug 922294) 2004-03-24 15:59:44 +00:00
Michal Krol
ae60852206 Slang internal include file defining constructors and operators
for built-in data types.
2004-03-24 15:02:37 +00:00
Brian Paul
aaba0751d5 tweaks to Darwin code 2004-03-23 23:25:47 +00:00
Brian Paul
19bb7f71f1 additional updates from Dan Schikore 2004-03-23 15:40:18 +00:00
Jouk Jansen
645778fe69 Committing in .
Adding s_auxbuffer.c for compilation

 Modified Files:
 	Mesa/src/mesa/swrast/descrip.mms
 ----------------------------------------------------------------------
2004-03-23 07:13:11 +00:00
Brian Paul
192c988c73 new DRI interface header 2004-03-22 23:31:29 +00:00
Brian Paul
b87c5d08c7 added some code to test buffer deletion 2004-03-22 16:28:02 +00:00
Brian Paul
f6a93d3dff use GL state vars instead of program parameters 2004-03-22 16:27:13 +00:00
Brian Paul
3b6eb90050 added s_auxbuffer.c 2004-03-22 16:23:15 +00:00
Dave Airlie
1cb63cfc98 more i810 to new interface 2004-03-21 23:35:14 +00:00
Felix Kuehling
03762ba8da ctx->Const.MaxTextureLevels is not the highest mipmap level but the number
> of levels, including 0.
2004-03-21 21:58:03 +00:00
Felix Kuehling
7e4a56d110 Improved MaxTextureLevel computation to take the nr. of tex units and both
texture heaps into account.
2004-03-21 18:50:21 +00:00
Brian Paul
57ff474cb0 added aux buffers item 2004-03-21 17:09:59 +00:00
Brian Paul
04da5cea31 test of aux buffer rendering 2004-03-21 17:07:30 +00:00
Brian Paul
894844a8d9 Implemented support for software-based AUX color buffers.
Only available with Xlib driver for now.
Assorted clean-ups related to Draw/ReadBuffer().
Renamed FRONT_LEFT_BIT -> DD_FRONT_LEFT_BIT, etc.
2004-03-21 17:05:03 +00:00
Brian Paul
0095016425 fix array index error in _swsetup_Translate (Felix) 2004-03-21 16:12:13 +00:00
Felix Kuehling
7ab89a9770 Removed some useless definitions, artifacts from the Utah-GLX i810 driver. 2004-03-21 12:05:24 +00:00
Dave Airlie
21fb1f9180 Add new interface support don't switch on yet .. 2004-03-21 11:47:03 +00:00
Felix Kuehling
416b7a8788 unsigned int -> uint32_t, unsigned char -> uint8_t where the size matters.
A bit more cosmetics.
Improved state emit on Savage 3D/IX/MX.
2004-03-21 11:28:07 +00:00
Felix Kuehling
9d68891901 Fixed texture LOD bias. 2004-03-20 22:05:29 +00:00
Felix Kuehling
fd8a7dc26b Fixed MAXFIFO_S4. Removed WAIT_IDLE_EMPTY from savage_BCI_swap which resulted
in another small speedup. Fixed a problem that was masked by that
WAIT_IDLE_EMPTY:
- flush command buffer and WAIT_IDLE_EMPTY before uploading textures
2004-03-20 19:40:09 +00:00
Felix Kuehling
ef8cb129f4 Cleaned up and fixed stencil fallback. 2004-03-20 17:12:06 +00:00
Brian Paul
a212e9670b minor clean-ups 2004-03-20 00:22:27 +00:00
Brian Paul
23be8efd6f make null-terminated copy of program string so that parse works correctly 2004-03-20 00:08:20 +00:00
Brian Paul
e29ac89dcd add missing else statements 2004-03-19 23:11:13 +00:00
Dave Airlie
00d2b873a9 Add includes to make mach64 build 2004-03-19 10:20:23 +00:00
Brian Paul
dde10b7c12 remove redundant call to ctx->Driver.Viewport(), and clean-ups 2004-03-18 18:17:33 +00:00
Brian Paul
ba9a2bd641 additional configs (Dan Schikore) 2004-03-18 16:02:27 +00:00
Brian Paul
c193bd0654 assorted updates and new AIX support (Dan Schikore) 2004-03-18 15:41:59 +00:00
Ian Romanick
6af3dca18a Convert int(8|32)_t to uint(8|32)_t, like should have been done the first time. 2004-03-18 00:16:44 +00:00
Ian Romanick
16c704e8f7 Convert all uses of CARD32 and CARD8 to int32_t and int8_t. 2004-03-17 20:50:12 +00:00
Dave Airlie
aae2fde0e6 remove version number faking, shouldn't be needed anymore 2004-03-15 23:27:33 +00:00
Dave Airlie
35de80d0cb extend SOLO code so the DDX version isn't checked 2004-03-15 23:26:49 +00:00
Keith Whitwell
c5fb1b7922 Sketch of codegen templates for t_vtx_api.c, not complete 2004-03-15 15:41:46 +00:00
Keith Whitwell
5262dcccc8 Streamline the error path in VertexAttrib functions. Makes things
slightly easier for codegen.
2004-03-15 14:36:16 +00:00
Daniel Borca
d83e9d9c00 unfinished SOLO driver for TDFX 2004-03-15 09:17:07 +00:00
Dave Airlie
e8036d23d7 couple of steps closer still not fully working.. something amiss in ring
buffer ..
2004-03-15 06:30:37 +00:00
Dave Airlie
6ff468d19e Initial i810_dri.c for miniglx isn't fully functional yet... 2004-03-15 05:20:08 +00:00
Dave Airlie
f4d07d4118 use utility function to check versions 2004-03-15 03:39:52 +00:00
Brian Paul
7d05e48478 more TRIANGLE_WALK_DOUBLE tweaks (Justin Novosad) 2004-03-14 18:12:06 +00:00
Brian Paul
3340a9ea9e fix stride bug in RGB and BGR span rendering 2004-03-14 16:41:49 +00:00
Brian Paul
746e59f207 GL_EXT_pixel_buffer_object test 2004-03-13 18:31:14 +00:00
Brian Paul
fde4c53a7d Added some comments. Minor const, int->GLint type changes, etc. 2004-03-13 18:27:06 +00:00
Brian Paul
7a6b71ef29 Implementation of GL_EXT_pixel_buffer_object extension.
Note: extension may not be finalized yet - subject to change!
Note: implementation not fully suitable for h/w implementation yet.
2004-03-13 18:21:40 +00:00
Brian Paul
5498e8b9f3 more descriptive error messages for matrix stack over/underflows 2004-03-13 16:32:58 +00:00
Jon Smirl
6ddfdff659 Adjust includes to help DRI build 2004-03-12 20:03:54 +00:00
Jon Smirl
d613cca2e4 Adjust mga drivers to remove redundant h file for sarea and IOCTLs 2004-03-12 05:22:13 +00:00
Jon Smirl
ba5c49ab42 Make R128 driver use sarea/defines from DRM. removed r128_common.h
and r128_sarea.h since they are redundant now.
2004-03-12 03:50:30 +00:00
Jon Smirl
5fb0763d2e These files are redundant now. Definitions come from DRM files. 2004-03-12 01:18:19 +00:00
Jon Smirl
ae4a1cc066 Adjustments to make everything use IOCTL/sarea defines in DRM instead
of glx/mini. removes glx/mini/drm.h glx/mini/sarea.h
2004-03-11 20:35:38 +00:00
Michal Krol
157ec8bcf8 Moved from src/mesa/main. 2004-03-10 18:02:01 +00:00
Brian Paul
ab928e57b9 don't futz with GL_CLIENT_ACTIVE_TEXTURE in glClientActiveTexture (Robert Merrill) 2004-03-10 16:17:35 +00:00
Michal Krol
30e6dda368 Fixed a number of typos. 2004-03-10 14:54:47 +00:00
Dave Airlie
7463640e17 add xmlconfig.c to solo build 2004-03-10 03:45:28 +00:00
Dave Airlie
d4b6724253 back port span changes from i810, these have been in my tree for a while seem
fine ..
2004-03-10 03:43:15 +00:00
Brian Paul
b2dd5095c4 remove unneeded casts 2004-03-09 18:04:04 +00:00
Brian Paul
1e4731f644 Fix color index mode rendering.
Changed SWvertex's index field to GLfloat and fix a few other bits.
2004-03-09 16:58:26 +00:00
Daniel Borca
7bcada8c27 fxMesa: remove buffer_obj_ext, cos it breaks UT2004 2004-03-09 11:23:39 +00:00
Felix Kuehling
15941b1d90 Cleaned up and slightly optimized the texture upload code. 2004-03-08 23:01:47 +00:00
Brian Paul
f76314a69a remove redundant macros (also in m_matrix.h) 2004-03-08 18:30:45 +00:00
Daniel Borca
0c19008f09 Voodoo Rush fixes 2004-03-08 07:52:18 +00:00
Felix Kuehling
446d8d0b86 Swapout textures who's space is claimed by a new texture. Don't destroy.
This finally really fixes assertion failures in savageBindTexture.
I think the same situation with several contexts is still broken though.
2004-03-08 00:34:43 +00:00
Felix Kuehling
a5c68c872d Fixed texture tiling format for 8bit texels on ProSavage and Twister. 2004-03-07 23:32:31 +00:00
Felix Kuehling
156df3e834 Rewrote tiled texture upload. Small mipmap levels work correctly now. 2004-03-07 20:41:42 +00:00
Felix Kuehling
2cd815b660 Fixed two small problems in the vertex setup.
- make sure that vertex setup is initialized
 - Savage seems to need the W coordinate for smooth shading
2004-03-07 01:36:50 +00:00
Felix Kuehling
2c8dacea5f Small texture management fixes. Should get rid of assertions some people were getting in savageBindTexture. 2004-03-04 22:11:38 +00:00
Brian Paul
9b71f621d1 plug in _mesa_BlendFunc into dispatch table 2004-03-04 17:14:08 +00:00
Brian Paul
d5e4f29cb9 a bunch of assorted clean-ups, etc to fix warnings, etc 2004-03-04 16:22:01 +00:00
Brian Paul
ff6031c209 remove some unneeded macros 2004-03-04 16:20:38 +00:00
Brian Paul
f753320f0f casts to silence warnings 2004-03-04 14:56:34 +00:00
Brian Paul
c26c1ddd56 silence warnings 2004-03-04 14:52:59 +00:00
Brian Paul
94ec525ba5 yet another take on VBO deleting and reference counting 2004-03-04 14:46:00 +00:00
Michal Krol
3f94cef027 Initial changes after moving from src/mesa/main/.
Needs testing - it havent been even compiled yet.
2004-03-04 13:15:32 +00:00
Michal Krol
a904b493a9 Added missing Copyrights. 2004-03-04 13:07:52 +00:00
Felix Kuehling
2462f6bfa0 Clearing rectangle was one too big in each direction. 2004-03-04 00:27:36 +00:00
Michal Krol
0e7b1d8811 Grammar package supporting 8-bit registers.
TODO:
  - add checking for duplicate symbols (or is it done already?)
  - move all the statics (grammar objects list and last error message)
    to the GL context state; I think simple pointer initialized in a
    first call to ProgramString() is sufficent.
  - apply an optimized version of match() - this will be needed for
    glslang compiler.
2004-03-03 18:10:40 +00:00
Michal Krol
e05d4fbf0f Added support for ARB_fragment_program_shadow. 2004-03-03 18:01:58 +00:00
Michal Krol
7bce486327 Initial registry for ARB_fragment_program and ARB_vertex_program. 2004-03-03 17:59:49 +00:00
Brian Paul
7c6a04f6d8 added clamping to polygon offset to prevent potential negative Z values and FP exceptions 2004-03-03 15:50:28 +00:00
Brian Paul
9a20a72cdc comments, capitalization, misc-clean-ups 2004-03-03 15:36:53 +00:00
Brian Paul
e22540c276 s/_swrast_exec_nv_fragment_program/_swrast_exec_fragment_program/ 2004-03-03 15:36:01 +00:00
Brian Paul
26895aa797 more changes to VBO reference counting and deletion 2004-03-03 15:35:08 +00:00
Daniel Borca
5ee631c6ee _tnl_allow_*_fog(...) 2004-03-03 09:07:43 +00:00
Daniel Borca
3abf2e4740 made NASM opcodes consistent 2004-03-03 09:03:40 +00:00
Felix Kuehling
fc17a6a35c Cope with float colors in VERT_SET_RGBA and VERT_SET_SPEC macros. 2004-03-02 23:48:32 +00:00
Felix Kuehling
2517a0ef21 Fixed some small state tracking issues while hunting a different problem. 2004-03-02 23:45:40 +00:00
Brian Paul
af745e5d4d fixed linux-osmesa16-static. Added linux-static config 2004-03-02 17:28:56 +00:00
Brian Paul
411b8faac4 added missing error check in _mesa_BeginQueryARB (Cedric Gautier). minor clean-ups. 2004-03-02 15:21:51 +00:00
Daniel Borca
fa21787b52 workaround for crash-upon-exit in verbose mode
fxMesa now uses grQueryResolution
minor fixes to X11 and DOS drivers
2004-03-02 08:15:24 +00:00
Roland Scheidegger
725a56f157 Fix calling fallback_drawarrays() with the wrong arguments 2004-03-01 23:29:27 +00:00
Roland Scheidegger
8cff2ede6e Add support for the new DRI driver interfaces to the radeon driver (patch ported from the r200 driver, r200_screen.c rev. 1.8 - 1.12) 2004-03-01 17:49:59 +00:00
Michel Dänzer
dbb0d2751f Inline get_size as an interim measure to get rid of function call overhead. 2004-03-01 13:02:29 +00:00
Felix Kuehling
cac8d425a8 Corrected the maximum vertex size argument of _tnl_init_vertices. 2004-02-29 20:43:54 +00:00
Felix Kuehling
c6338e60ff Reorganized hardware state data structures and state emission. Don't track
which registers changed in all the functions that change the state. Instead
check which registers changed in the end when the hardware state is updated.
Tried to avoid cosmetic (whitespace) changes in this commit.
2004-02-29 20:42:22 +00:00
Brian Paul
4923e1926a Remove clamp parameter from _mesa_unpack_color_span_float(). Pass the
IMAGE_CLAMP_BIT if needed.
Added ClampVertexColors and ClampFragmentColors to GLcontext in anticipation
of upcoming extensions (not fully used yet).
2004-02-28 22:30:58 +00:00
Brian Paul
94f9d4c0dd minor clean-ups 2004-02-28 21:19:27 +00:00
Brian Paul
833d96aa91 consolidate image transfer operations in new _mesa_apply_rgba_transfer_ops() function 2004-02-28 21:10:19 +00:00
Brian Paul
8cfd08b613 rename some span pack/unpack functions for better uniformity 2004-02-28 20:35:57 +00:00
Brian Paul
d0582776a6 move _swrast_texture_table_lookup() to _mesa_lookup_rgba_chan() 2004-02-28 20:12:33 +00:00
Brian Paul
456734aa0a consolidate some code 2004-02-28 19:58:19 +00:00
Brian Paul
aaad687d51 replace color table FloatTable boolean with Type enum 2004-02-28 19:34:05 +00:00
Brian Paul
d14da2d5ae paltex demo from recent texcombine changes. Minor clean-ups 2004-02-28 19:33:03 +00:00
Michel Dänzer
e2df3d01af Only print message about disabling HW TCL if the chip supports it in the
first place, and make the message a bit clearer.

+ Remove some extraneous whitespace.
2004-02-28 13:25:25 +00:00
Ian Romanick
1cb11ce1c5 Create all the right modes for 16-bit screens. 2004-02-27 19:12:29 +00:00
Ian Romanick
ad1e06fafe Fix a problem with 24-bit screens. Modes with 0 stencil bits were
erroneously marked as GLX_SLOW_CONFIG.
2004-02-27 19:11:08 +00:00
Brian Paul
db79b5683c move _mesa_load_state_parameters() to state validation stage 2004-02-27 02:13:29 +00:00
Brian Paul
579ea7ff7a fix PK2H, UP2H, PK2US bugs 2004-02-27 01:28:24 +00:00
Brian Paul
fca9121a21 check for null paramList 2004-02-26 22:20:29 +00:00
Brian Paul
e6149fac64 check for invalid fragment program in glDrawPixels, glCopyPixels and glBitmap 2004-02-26 22:13:32 +00:00
Brian Paul
1ef3d3a758 check for invalid vertex/fragment program in glBegin 2004-02-26 22:09:28 +00:00
Brian Paul
04207ab7e2 fix another glDrawArrays indexing bug, jump through _glapi_Dispatch functions 2004-02-26 22:09:05 +00:00
Brian Paul
09a4f915d3 fix library naming glitches (bug 904867) 2004-02-26 15:21:41 +00:00
Brian Paul
c8957aa896 Fix C/C++ calling conventions problem (Bug 904854) 2004-02-26 14:58:11 +00:00
Felix Kuehling
89d04e4623 Set ctx->Const.MaxTexture[Image/Coord]Units correctly. Fixes corruption in q3. 2004-02-26 13:22:16 +00:00
Felix Kuehling
76283a9079 Adapt the VERT_SET/COPY/SAVE/RESTORE_RGBA/SPEC macros to copy with all savage vertex formats. 2004-02-26 12:19:41 +00:00
Felix Kuehling
229654d815 Forgot to remove savagevb.h in last commit. 2004-02-26 01:00:00 +00:00
Felix Kuehling
d9a0330872 Converted vertex setup to use t_vertex.[ch]. 2004-02-26 00:59:00 +00:00
Ian Romanick
795f1faf81 Create all the right modes for 16-bit screens. 2004-02-26 00:33:22 +00:00
Brian Paul
04bcaac383 added _tnl_allow_vertex/pixel_fog() calls 2004-02-26 00:28:03 +00:00
Felix Kuehling
21893e56e0 Call _tnl_allow_pixel/vertex_fog in savageCreateContext. (Brian Paul) 2004-02-25 20:47:46 +00:00
Brian Paul
54056db8db use ABS(Z) when computing blend factors 2004-02-25 16:14:16 +00:00
Brian Paul
20e25ca50a call _tnl_allow_pixel/vertex_fog() funcs 2004-02-24 16:11:30 +00:00
Brian Paul
8d407300c2 turns out we probably need a _tnl_allow_pixel_fog() function afterall 2004-02-24 16:10:52 +00:00
Brian Paul
4d5dddd125 jump through dispatch table instead of calling gl functions directly 2004-02-24 15:08:22 +00:00
Brian Paul
9d1ff8c1bb fix incorrect texcoord attribute index 2004-02-24 14:59:26 +00:00
Brian Paul
2615e81620 added some GLAPIENTRY keywords, minor clean-ups 2004-02-24 14:47:01 +00:00
Brian Paul
4a048e5e48 s/transform/tnl/ 2004-02-24 04:57:48 +00:00
Brian Paul
0adce8f7c7 upgraded to version 22 2004-02-24 03:01:27 +00:00
Brian Paul
1e3d868ffb Yet another revision of _ae_update_state(). Issue both conventional AND
generic vertex attribute commands, ignoring ctx->VertexProgram.Enabled
since this function may be used during display list compilation.
2004-02-24 02:49:43 +00:00
Brian Paul
0f1e19c03c added some const keywords 2004-02-24 02:47:05 +00:00
Brian Paul
ffa7eff9ff glDrawArrays loop was wrong 2004-02-24 02:42:46 +00:00
Brian Paul
cf20f8cc3f updates from Erdi Chen 2004-02-23 21:07:12 +00:00
Brian Paul
537f42e240 fix typo (Matt Case) 2004-02-23 20:26:58 +00:00
Ian Romanick
c00fbd55ba The available GLX version is now logged in addition to the client
version and the server version.
2004-02-23 17:37:36 +00:00
Dave Airlie
001dc022fc delete the textures 2004-02-23 06:35:22 +00:00
Felix Kuehling
263581bba4 Imported the Savage DRI driver from the savage-2-0-0-branch of DRI CVS
with modifications to make it work with current Mesa 6.
2004-02-22 16:11:12 +00:00
Brian Paul
6e450f22bb some minor tweaks 2004-02-21 18:08:41 +00:00
Daniel Borca
2aa84490c0 fixed some typos 2004-02-20 09:47:42 +00:00
Ian Romanick
304d3aa9cb Refactored several variables out of XMesaVisual in favor of identical
fields in __GLcontextModes (the base type).  Removed the need to keep
the XMesaVisualInfo pointer when building inside the X-server.
2004-02-19 00:57:04 +00:00
Brian Paul
e01370271e recent bug fixes/changes (fog, glArrayElement, triangle rasterization) 2004-02-17 23:38:05 +00:00
Brian Paul
0733dbb011 A few more tweaks to fog code.
Remove unneeded FABSF() macros.
Added blend factor clamping in a few spots.
2004-02-17 22:14:18 +00:00
Brian Paul
4e41eb1061 compute fog coord in eye space, not clip space 2004-02-17 22:00:45 +00:00
Brian Paul
09da0b8e66 A bit of an overhaul of the fog code.
glFogCoord didn't always work reliably.
ARB fragment program fog options work now.
Per-fragment fog computations are now perspective corrected.
2004-02-17 21:03:03 +00:00
Brian Paul
9a389d4bdb define DO_FRAGMENT_FOG=1 to test fragment program fog option 2004-02-17 17:59:59 +00:00
Brian Paul
a60c89e8c8 added SPAN_W 2004-02-17 14:08:23 +00:00
Brian Paul
230ebaff2a just some reformatting 2004-02-17 04:28:37 +00:00
Brian Paul
4250c7acac some debug code 2004-02-17 04:26:42 +00:00
Brian Paul
5cd79f9267 added FogOption to fragment_program struct 2004-02-17 04:25:24 +00:00
Brian Paul
c2f6d6d092 added FixedToDouble() macro 2004-02-17 04:24:52 +00:00
Brian Paul
84b4a3a087 Added TRIANGLE_WALK_DOUBLE to optionally walk triangle edges with GLdoubles
instead of GLfixed. (Justin Novosad)
2004-02-17 03:51:47 +00:00
Roland Scheidegger
bb1dcb4fad texture env combine refactor (Andreas Stenglein), following the same principles as the refactored code already present in the R200 driver 2004-02-16 17:34:03 +00:00
Brian Paul
64d6ddabaa remove incorrect negation in fog coord computation 2004-02-16 16:44:40 +00:00
Keith Whitwell
477363455d Add _tnl_set_attr() to complement existing get_attr() call. 2004-02-16 15:15:24 +00:00
Keith Whitwell
7b5199e8a4 glutInitWindowPosition 2004-02-16 14:45:56 +00:00
Daniel Borca
45f4c5ec3b cleanup and some WGL PIXELFORMAT issues 2004-02-16 07:32:27 +00:00
Daniel Borca
a49a08d014 fog_coord demo 2004-02-16 07:31:29 +00:00
Brian Paul
05ad3078a9 some code clean-ups 2004-02-15 17:45:17 +00:00
Brian Paul
7c4a61c57f Minor clean-ups of variable scopes, initializations, etc.
New comments discussing FIXED_FRAC_BITS, SUB_PIXEL_BITS, max viewport size
and rasterization accuracy.
2004-02-15 16:21:07 +00:00
Keith Whitwell
0200947f5e Remove debug 2004-02-14 15:49:55 +00:00
Keith Whitwell
964e5325bd Make it easier for drivers to create "subclasses" of the existing
program struct hierarchy.

Add driver callbacks to enable the above and make it possible to track
more changes to program objects.
2004-02-14 15:00:42 +00:00
Brian Paul
70dacabfe5 added note about kernel modules 2004-02-13 18:29:42 +00:00
Ian Romanick
659dce40e2 Minor tweaks to get the fbconfig list returned by __driCreateNewScreen
to pass through filter_modes (in libGL) properly.
2004-02-13 17:38:41 +00:00
Brian Paul
9ad80a475d info about precompiled libs for Solaris 2004-02-13 15:50:13 +00:00
Brian Paul
88bf038708 init secondary color to (0,0,0,1). remove some redundant initializations. 2004-02-13 15:30:08 +00:00
Brian Paul
85ad44b292 set buffer object default Usage and Access 2004-02-13 14:04:26 +00:00
Brian Paul
de47068b85 new comments, rename some stuff 2004-02-13 03:00:11 +00:00
Ian Romanick
71996ddbe1 Fix a problem that caused the new interface code to not actually be
used.  Fix a couple problems that confound the fbconfig filtering code
in libGL.
2004-02-12 23:03:19 +00:00
Ian Romanick
0370d0829b Enable use of new DRI interface in MGA driver. 2004-02-12 22:59:03 +00:00
Brian Paul
193d211a19 Minor re-org of state for fog and precision options. 2004-02-12 21:57:29 +00:00
Brian Paul
5396ab2742 bunch of assorted updates/changes 2004-02-12 14:48:52 +00:00
Dave Airlie
d03814f426 minor cleanups from t_dd_vb.c 2004-02-12 12:05:54 +00:00
Dave Airlie
7b6ceb5b12 remove vertex_stride_shift, fix up code to not need it 2004-02-12 11:52:38 +00:00
Dave Airlie
da8337ed5e fix up specular color/fog and triangle vertex retrieval 2004-02-12 11:20:29 +00:00
Dave Airlie
9a78c29f7a fixup vertex building code .. 2004-02-12 06:39:57 +00:00
Dave Airlie
d2f0be152e more updates , gears sorta works 2004-02-12 01:57:43 +00:00
Brian Paul
0d4393a38a Fix the problem found with UT after I had added support for glVertexAttrib.
The problem came from using the _glapi_Dispatch->VertexAttrib*fvNV pointers
since they can change from one glArrayElement call to the next.
2004-02-11 22:53:38 +00:00
Dave Airlie
d4baed717f initialise VBLANK 2004-02-11 22:53:12 +00:00
Brian Paul
2020278d06 Do more bookkeeping of vertex buffer object reference counts.
Incr/decr counts when doing glPush/PopClientAttrib(GL_CLIENT_VERTEX_ARRAY_BIT).
2004-02-11 22:06:05 +00:00
Ian Romanick
840e82163d Added a test case for Mesa bug #508473 that I wrote a long time ago.
Fixed the Makefile.X11 to actually build glxgears_fbconfig when
invoked from the top level.
2004-02-11 20:16:26 +00:00
Ian Romanick
0b87abd11b Initial pass at adding support for the new DRI driver interfaces to
the R200 driver.  Not as clean / well commented as it should / could be.
2004-02-11 08:11:58 +00:00
Ian Romanick
1d6e08db95 Added yet another version of gears. This one uses fbconfigs, and is a
rudimentary test of fbconfigs that doesn't use pbuffers of
GLX_SGI_make_current_read.
2004-02-11 08:00:42 +00:00
Roland Scheidegger
faaf78aeb0 revert to version 1.18 for now to fix segfaults in some applications 2004-02-11 01:06:03 +00:00
Roland Scheidegger
f64f940281 change lighting to use MULT instead of PREMULT (i.e. move some lighting color calculations to the GPU) 2004-02-10 23:52:18 +00:00
Brian Paul
53c50f1667 some useful matrix functions 2004-02-10 23:41:20 +00:00
Daniel Borca
22633805fa fixed back fxMesaGetCurrentContext to match MakeCurrent 2004-02-10 07:46:07 +00:00
Roland Scheidegger
a1b9b1a440 Changed lighting to use SOURCE_MATERIAL instead of PREMULT (moves some light color calculations to the GPU). Two-side lighting fallback no longer needed and eliminated. 2004-02-10 02:20:29 +00:00
Daniel Borca
1440f73212 reorganized DMesa to fxMesa wrapper 2004-02-09 08:46:38 +00:00
Daniel Borca
89625ef634 deal with combine_ext refactor 2004-02-09 07:39:03 +00:00
Brian Paul
53ad036972 Restore some of the previous code for handling conventional vertex attributes
more efficiently.
Remove switches/conditionals from vertex attribute wrappers.
glMultiTexCoord is implemented in terms of glVertexAttrib.
2004-02-09 00:24:48 +00:00
Brian Paul
646dffd44d tweak solaris-x86-gcc and ggi targets 2004-02-08 17:17:09 +00:00
Brian Paul
0aa8a1062a Updated to handle generic vertex attributes accessed vi glArrayElement().
In fact, handle all conventional vertex attributes in terms of generic
attributes (execept for edge flags and color indexes).
2004-02-08 02:03:41 +00:00
Brian Paul
08a45d4d4f fully parameterize the macros for fixed-point arithmetic 2004-02-08 00:37:32 +00:00
Brian Paul
875f763c9f added an additional comment about mipmap generation 2004-02-08 00:36:56 +00:00
Brian Paul
529614cd1a implement Fake_glXCreateWindow() to fix bug #890894 2004-02-08 00:11:14 +00:00
Daniel Borca
54447772d5 removed MGA driver from DMesa 2004-02-07 10:56:13 +00:00
Daniel Borca
d039b43e30 added NUL driver for DMesa 2004-02-07 10:54:36 +00:00
Ian Romanick
07d6a98359 Refactor "class" texture environments to be implemented in terms of
ARB_texture_env_combine state.
2004-02-06 17:39:03 +00:00
Roland Scheidegger
c71ee917e3 inform driver of changed wrap/filter parameters due to binding of nv_texrect texture 2004-02-06 15:27:42 +00:00
Roland Scheidegger
4c6b629b38 remove bogus check of texture target in R200TexParameter 2004-02-06 15:25:37 +00:00
Roland Scheidegger
c2f28a3fd1 align blits for texture rectangles correctly, fix potential problem overwriting dma region 2004-02-06 15:24:51 +00:00
Roland Scheidegger
786e822cd4 fix potential problem overwriting dma region 2004-02-06 15:23:20 +00:00
Roland Scheidegger
531b59db3c remove bogus check of texture target in RadeonTexParameter 2004-02-06 15:20:59 +00:00
Brian Paul
e5a94ba138 Added flags for _all_ extensions to the gl_extensions struct so that drivers
can disable any extension if necessary.
2004-02-06 02:01:47 +00:00
Brian Paul
1f3d9eedad added GLU_INCOMPATIBLE_GL_VERSION 2004-02-06 01:17:30 +00:00
Dave Airlie
74eeb37c00 fix missing include for SOLO build 2004-02-06 00:42:58 +00:00
Dave Airlie
6c7bb5ebbd Remove warnings from mach64 build, fix up some _SOLO stuff,
update to newer Mesa interfaces...
2004-02-06 00:16:26 +00:00
Dave Airlie
0fbeff2fa2 Initial mach64 driver import for DRI mach64-0-0-6 branch,
this compiles but I doubt it works but it is a better starting point
than the branch
2004-02-05 22:45:00 +00:00
Keith Whitwell
493e6e1e90 Add comments to make decyphering the faces easier 2004-02-05 17:36:02 +00:00
Brian Paul
c2f739169e update function mangling and add comment about it to gl.h 2004-02-05 15:23:12 +00:00
Brian Paul
e2e9dc221d bring in Keith's _math_matrix_ortho() compiler work-around 2004-02-05 15:05:09 +00:00
Dave Airlie
540bb3a830 fix ugly bug triggered by macro expansion 2004-02-05 06:39:20 +00:00
Brian Paul
b3063ac398 fix glXChooseFBConfig bug 890167 2004-02-04 23:39:19 +00:00
Brian Paul
ef18e23bf8 fix typo 2004-02-04 23:36:00 +00:00
Keith Whitwell
36ff43b596 Fix off-by-one in calculations for wrapped trifan, polygon primitives 2004-02-04 16:59:30 +00:00
Brian Paul
b19cb627e0 fix stores to vertex state program registers 2004-02-04 15:44:53 +00:00
Keith Whitwell
72aeea4eea Use quads instead of lines to ensure this is testing stencil functionality
rather than rasterization.  A crutch to hw with wonky line
rasterizers.
2004-02-04 15:27:39 +00:00
Brian Paul
867fa0b572 another tweak to two-sided detection test 2004-02-04 03:34:30 +00:00
Brian Paul
609f35274c fix two-sided lighting / vertex program bug (#887330) 2004-02-04 03:00:42 +00:00
Brian Paul
d761adad5d added Daniel Stone for getting CVS access 2004-02-03 23:36:59 +00:00
Brian Paul
b6a9cb7095 another pbuffer demo (Andrew Lentvorski) 2004-02-03 16:23:38 +00:00
Brian Paul
20c831bb89 s/getenv/_mesa_getenv/ 2004-02-02 22:36:58 +00:00
Brian Paul
b07d6a8158 updated list of env vars 2004-02-02 22:35:55 +00:00
Felix Kuehling
cc5d045744 Include context.h in radeon_state.c. 2004-02-02 21:26:40 +00:00
Brian Paul
3a99674980 glXChooseFBConfig() didn't handle GLX_FBCONFIG_ID option 2004-02-02 15:40:21 +00:00
Brian Paul
18a949000c tweak comments 2004-02-02 15:38:26 +00:00
Daniel Borca
61bc62cc40 added glutGetProcAddress in DMesaGLUT 2004-02-02 07:47:23 +00:00
Daniel Borca
4c7883e402 fixed a bug in GL_NEAREST sampler 2004-02-02 07:46:27 +00:00
Brian Paul
c9e1c8098b added display list option (l key) 2004-01-31 19:57:25 +00:00
Brian Paul
1e71d2af5e minor #ifdef fix 2004-01-31 19:49:10 +00:00
Brian Paul
6bbcae9473 added _NEW_PROGRAM to check_state flags for pipeline stages (fixes vparray demo bug) 2004-01-31 19:39:04 +00:00
Brian Paul
27ec7a5bf1 add vparray.c, fix indentation 2004-01-31 19:15:57 +00:00
Brian Paul
919404fd1d enable program and arrays by default, minor clean-ups 2004-01-31 19:15:43 +00:00
Brian Paul
041e66b0d6 don't call gl functions directly, jump through _glapi_Dispatch table 2004-01-31 19:08:45 +00:00
Brian Paul
f5dbba7ec3 add missing CXX, CXXFLAGS for osf1 (Bug 886628) 2004-01-31 17:12:19 +00:00
Brian Paul
111156affe glBindProgramARB wasn't getting compiled into display lists (bug 887383) 2004-01-30 23:36:35 +00:00
Brian Paul
26baf96bea added unichrome directory 2004-01-30 23:32:19 +00:00
Brian Paul
f924a933b4 Minor fixes for recent Mesa 6.1 changes 2004-01-30 23:31:51 +00:00
Brian Paul
f18598cbd2 Via Unichrome/cle266 driver (Erdi Chen) 2004-01-30 23:26:19 +00:00
Brian Paul
2726d77b2e more descriptive error strings 2004-01-30 17:39:11 +00:00
Keith Whitwell
bacd9d1739 Fix extract_3f_xyw(). 2004-01-30 11:16:12 +00:00
Brian Paul
229d6a9624 replace spaces w/ tabs 2004-01-29 16:32:18 +00:00
Daniel Borca
4fe1303e83 GL_TEXTURE_1D and other stories... 2004-01-29 15:46:02 +00:00
Brian Paul
f8c31fcba3 more IRIX tweaks 2004-01-29 15:21:47 +00:00
Brian Paul
dc8f8bd88f fix ARCHOPT typo 2004-01-29 14:46:16 +00:00
Brian Paul
9ca723f5f5 fix C++ link issues on IRIX 2004-01-28 22:54:33 +00:00
Karl Schultz
b72902e061 Add GLAPIENTRY function decorations for correct operation on Windows. 2004-01-28 22:24:12 +00:00
Brian Paul
5e83c2a081 tweak the #if test for defining _ASMAPI (fixes IRIX problem) 2004-01-28 22:01:47 +00:00
Brian Paul
938014f850 minor fixes to glw's touch depend 2004-01-28 22:00:13 +00:00
Karl Schultz
77650b4672 Fix compiler options regarding exception handing to resolve warnings. 2004-01-28 19:46:12 +00:00
Karl Schultz
1ce9940c79 Avoid setting NOWIN98 compiler optimization with VC 7. 2004-01-28 19:00:34 +00:00
Ian Romanick
253428f06a Fixed a cut-and-paste bug from the BlendFuncSeparate driver interface
change.
2004-01-28 17:35:49 +00:00
Alan Hourihane
29b2ced167 fix printf warnings 2004-01-28 16:28:53 +00:00
Brian Paul
e8df62b5a7 patch from bug 885992 2004-01-28 15:15:14 +00:00
Brian Paul
c24d40b178 s/BlendEquatioRGB/BlendEquationRGB/ 2004-01-28 15:14:09 +00:00
Keith Whitwell
eabe7beeaa add glutInitWindowPosition calls 2004-01-28 10:09:59 +00:00
Keith Whitwell
469d1b0f22 Add glutInitWindowPosition call 2004-01-28 10:07:48 +00:00
Keith Whitwell
27413ed249 Move FRAG_BIT_ definitions to mtypes.h so that NEED_SECONDARY_COLOR() macro
works globally.
2004-01-28 09:29:21 +00:00
Keith Whitwell
43b5772834 Use NEED_SECONDARY_COLOR() for checking specular state at all times
when ctx->_TriangleCaps might be inaccurate (ie while ctx->NewState might
be non-zero).
2004-01-28 08:21:05 +00:00
Dave Airlie
c78a89d761 fix breakage associated with pointers not being initialised in
mesa_create_context
2004-01-28 03:58:49 +00:00
Brian Paul
5102075330 change PFNGLXGETUSTPROC's argument from uint64_t to int64_t to match the DRI 2004-01-27 22:44:35 +00:00
Ian Romanick
74cf25b081 Missed this commit as part of the addition of
GL_EXT_blend_equation_separate / GL_ATI_blend_equation_separate.
2004-01-27 21:40:35 +00:00
Ian Romanick
c93105eb9e Added support for EXT_blend_equation_separate / ATI_blend_equation_separate.
The internal driver interface was also changed to use
BlendEquationSeparate instead of BlendEquation.
2004-01-27 18:52:40 +00:00
Keith Whitwell
dd9e6e7e37 Catch and shortcircuit no-primitive and no-vertex cases in _tnl_wrap_buffers() 2004-01-27 18:44:50 +00:00
Karl Schultz
da2be88f18 Add new driverfuncs. 2004-01-27 18:28:58 +00:00
Keith Whitwell
18fa367ac6 Consolidate texObj->Pos/Neg/X/Y/Z and texObj->Image into a single
array, texObj->Image[face][level].
2004-01-27 16:34:45 +00:00
Keith Whitwell
740f7de085 Tweak: set z scale to one, else tnl thinks we have a 3d texcoord. 2004-01-27 16:18:00 +00:00
Brian Paul
727d345b41 remove bogus assertion in DeleteTexture() function 2004-01-26 23:57:19 +00:00
Felix Kuehling
8135a445f3 Make the drivers using the common texmem code work with NewTextureObject
in Mesa. This is analogous to changes idr made to the r200 driver. Patch
submitted by Andreas Stenglein.
2004-01-26 23:38:12 +00:00
Keith Whitwell
ef167c6328 Fix for recursion in generic_copy_pv_extras.
Add a comment.
2004-01-26 21:34:28 +00:00
Brian Paul
cb7c689e14 replace MALLOC w/ CALLOC to silence valgrind warnings 2004-01-26 16:16:16 +00:00
Keith Whitwell
ab41a96ae7 Add tests for ARB_fp trig instructions and also for 1D texturing 2004-01-26 13:45:42 +00:00
Daniel Borca
5d3568f36c minimize the number of DIVs 2004-01-26 10:43:50 +00:00
Daniel Borca
8d2cfa9ea0 glutTimerFunc cleanup 2004-01-26 10:41:39 +00:00
Daniel Borca
d3682ce376 accomodate FetchTexel and fix some memory leak bugs 2004-01-26 10:38:46 +00:00
Brian Paul
c9d2f4ca47 updated GLUT link 2004-01-26 00:30:08 +00:00
Brian Paul
1749a25ca8 New error checking in _mesa_GetTexImage().
Updated comments and some better function parameter names.
2004-01-24 17:17:25 +00:00
Brian Paul
fe03108ce0 Some initial RGB and RGBA floating point texture formats. 2004-01-24 17:02:19 +00:00
Brian Paul
c6bf130e98 initial info for version 6.1 2004-01-24 16:53:20 +00:00
Brian Paul
b4b35bcc42 New glXUseRotatedXFontMESA() function. Like glXUseXFont(), but takes
a rotation parameter (either 0, 90, 180 or 270 degrees).
Also, a demo program.
2004-01-24 16:50:35 +00:00
Brian Paul
eaaf618bb8 added link to ORSA (per request) 2004-01-24 15:20:24 +00:00
Felix Kuehling
83e0cfb8a0 Parse radeon, not r200 configuration in radeonCreateContext. 2004-01-24 14:41:24 +00:00
Michel Dänzer
78bb0803cf Fix hardware ROP state handling (Roland Scheidegger) 2004-01-24 12:35:13 +00:00
Brian Paul
4d859f73fc added device driver hooks for BindProgram, NewProgram, DeleteProgram 2004-01-23 18:57:05 +00:00
Brian Paul
f2ce4dc7da Change software alpha plane pointers from void* to GLchan*, eliminate some casts. 2004-01-23 18:56:25 +00:00
Brian Paul
292615071a more fixing for tdfxUpdateTexturePalette 2004-01-23 18:51:00 +00:00
Brian Paul
7f7b2d86bc a few more tweaks 2004-01-23 16:08:35 +00:00
Brian Paul
75a0d31aaa fix assorted compilation issues 2004-01-23 16:03:33 +00:00
Daniel Borca
3d06dc7581 accomodated new driver_func initialization
added DMesaGetProcAddress
some other minor fixes
updated documentation
2004-01-23 15:57:52 +00:00
Keith Whitwell
3abf746a7e Don't set extra bits in FLUSH_VERTICES, fix several state bugs. 2004-01-23 14:46:27 +00:00
Jouk Jansen
5c161cf615 Committing in .
Trying to remove the <CR> at the end of each line.

 Modified Files:
 	Mesa/src/mesa/descrip.mms
 	Mesa/src/mesa/drivers/common/descrip.mms
 	Mesa/src/mesa/drivers/osmesa/descrip.mms
 	Mesa/src/mesa/drivers/x11/descrip.mms
 ----------------------------------------------------------------------
2004-01-23 10:13:40 +00:00
Ian Romanick
ff2cc41ccb Modified error messages in _mesa_BlendFuncSeparateEXT to note that the
same function is used internally for glBlendFunc and
glBlendFuncSeparate.
2004-01-23 07:57:32 +00:00
Michel Dänzer
a2c97eb2ff Call UpdateMaterial() unconditionally on GL_COLOR_MATERIAL state change
(Roland Scheidegger), and update lighting state unconditionally there.
Fixes lighting oddities in the xscreensaver endgame hack, bzflag and
possibly elsewhere.
2004-01-23 03:33:04 +00:00
Michel Dänzer
5d00e131d8 Fix attenuation hardware state handling, inspired by the R200 DDK reference
driver (our r200 driver basically didn't do this at all, maybe got lost
along the way?)
2004-01-23 03:19:47 +00:00
Brian Paul
4f295cee73 Initial support for floating point and signed texture formats.
New "FetchTexelFuncF()" function returns texels in floating point format.
Only used for depth component images at this time.
Changed original FetchTexelFunc to return GLchan instead of GLvoid, removing
need for a bunch of ugly casts.
2004-01-23 01:59:54 +00:00
Brian Paul
edd1d86c74 misc updates 2004-01-23 01:56:26 +00:00
Keith Whitwell
dca71ea44b Minor tweaks to help out at a driver level. 2004-01-22 22:40:40 +00:00
Ian Romanick
004d71f554 Corrected a comment about how the DOT3 hardware works in the R200. 2004-01-22 16:25:02 +00:00
Jouk Jansen
03166f73f3 Committing in .
Updated OpenVMS compile support

 Modified Files:
 	Mesa/Makefile.X11 Mesa/src/mesa/descrip.mms
 	Mesa/src/mesa/drivers/osmesa/descrip.mms
 	Mesa/src/mesa/drivers/x11/descrip.mms
 Added Files:
 	Mesa/src/mesa/drivers/common/descrip.mms
 ----------------------------------------------------------------------
2004-01-22 15:02:17 +00:00
Ian Romanick
afa446db83 Silence some compiler warnings. 2004-01-21 17:03:58 +00:00
Ian Romanick
169223c9ee Make the R200 driver work with the NewTextureObject in Mesa. Other
drivers that use the texmem interface will likely need similar changes.
2004-01-21 16:42:30 +00:00
Ian Romanick
34a7857411 Silence a compiler warning DRI builds using gcc3. 2004-01-21 16:26:05 +00:00
Keith Whitwell
66691ef5b5 Use new EMIT_PAD functionality for spec and/or fog as available.
Fix a couple of problems with texture emit.
2004-01-21 16:24:05 +00:00
Ian Romanick
20a17e42d7 Remove dd_function_table::BlendFunc. All drivers now use
dd_function_table:BlendFuncSeparate.  If a driver does not actually
support EXT_blend_func_separate, it can assume that the RGB and alpha
blend functions are the same.
2004-01-21 16:08:43 +00:00
Keith Whitwell
4d36f334c9 Another mechanism to create vertices with holes - a new EMIT_PAD style 2004-01-21 15:31:46 +00:00
Brian Paul
e98986bdd3 don't call glVertex functions directly, call _glapi_Dispatch->Vertex(), etc 2004-01-21 04:13:49 +00:00
Brian Paul
a999e809af remove _mesa_check_driver_hooks() - it's really not too useful anymore 2004-01-20 23:55:45 +00:00
Brian Paul
4e713913fb Undo some bits from last check-in related to the ctx->Driver.NewTextureObject
functions.  Don't allocate the driver-specific data during texture object
creation but do it later as needed (as code originally was).
2004-01-20 15:24:50 +00:00
Daniel Borca
d4636e74c8 fixed a bug in VGA initialization routine 2004-01-20 14:15:35 +00:00
Keith Whitwell
e755144e79 remove duplicate t_dd_* files 2004-01-20 11:22:20 +00:00
Brian Paul
d8059008a2 initial 6.1 release notes with info about recent _mesa_create_context changes, etc. 2004-01-20 02:54:51 +00:00
Brian Paul
d3fd7ba8af Before calling _mesa_create_context(), initialize a dd_function_table struct
by calling _mesa_init_driver_functions() and then plugging in the driver-
specific functions.
In particular, make sure ctx->Driver.NewTextureObject points to the
appropriate driver function so that _all_ texture objects are augmented
with the driver-specific data.
Put in a bunch of assertions in the texture-related driver functions that
texObj->DriverData is valid.  Remove old dead code in near future.
2004-01-20 02:49:27 +00:00
Brian Paul
988a8862c8 _mesa_init_driver_functions() to initialize dd_function_table 2004-01-20 02:36:44 +00:00
Keith Whitwell
8d97ad18a7 some more count vs. end confusion 2004-01-19 23:29:40 +00:00
Brian Paul
6bf808bc6c replace -lm with $(GL_LIB_DEPS) to get -lexpat 2004-01-19 18:06:30 +00:00
Brian Paul
9c0b83556d replace CALLOC with MALLOC in _mesa_new_texture_object() 2004-01-19 17:41:02 +00:00
Brian Paul
c929f13701 remove incorrect comments, added _mesa_bzero() call in _mesa_initialize_texture_object() 2004-01-19 17:35:41 +00:00
Brian Paul
75c8a2e7be omit CVS directories from tarballs, bump version to 6.1 2004-01-19 16:56:50 +00:00
Keith Whitwell
ed43ecee90 Migrate i830 driver to t_vertex.[ch] for building hw vertices. 2004-01-19 10:41:35 +00:00
Brian Paul
41abe9e73f fix glitch from previous check-in (pointer vs int) 2004-01-19 00:32:43 +00:00
Brian Paul
77d240858e minor changes to silence warnings 2004-01-18 17:22:50 +00:00
Brian Paul
6a82d44d9c Change get_ust_nop()'s parameter from int64_t to uint64_t to silence warnings. 2004-01-18 17:22:25 +00:00
Brian Paul
87745ce771 change Data ptr from GLbyte to GLubyte to silence warnings 2004-01-18 17:21:15 +00:00
Brian Paul
013dee06c1 include texobj.h to silence warnings 2004-01-18 17:20:41 +00:00
Brian Paul
e093e94298 s/char/GLubyte/ to silence warnings 2004-01-18 17:19:45 +00:00
Brian Paul
ef77464a7a include sched.h to get sched_yield() prototype 2004-01-18 17:19:05 +00:00
Brian Paul
97fcc0e77b make second param of driParseConfigFiles() const 2004-01-18 17:18:43 +00:00
Brian Paul
5b9a9d46d4 tweak OpenBSD and SunOS commands 2004-01-17 18:31:12 +00:00
Brian Paul
4eb16e3a67 tweak openbsd config 2004-01-17 18:30:52 +00:00
Brian Paul
66f2fd89ea added some missing FLUSH_VERTICES calls 2004-01-17 17:33:22 +00:00
Michel Dänzer
8d83242c8c Fix cosmetic GL_RENDERER string problem (Andreas Stenglein) 2004-01-17 16:05:40 +00:00
Brian Paul
edc9ffc748 bump version to 6.1 (new development) 2004-01-16 21:26:30 +00:00
Keith Whitwell
4a53f7bc74 Respect the 'in_use' field in the global LRU as a marker for
kernel-reserved memory regions.
2004-01-16 13:41:18 +00:00
Daniel Borca
48e89df25b fixed refresh rate control in Glide wrapper 2004-01-16 06:59:50 +00:00
Brian Paul
546214f3c8 tweaks for 6.0 release 2004-01-15 15:47:57 +00:00
Karl Schultz
46d6bd368d add casts to quiet compiler warnings 2004-01-15 15:43:07 +00:00
Brian Paul
6290ca42f2 fix -fomit-frame_pointer typo 2004-01-15 14:24:37 +00:00
Daniel Borca
f8761dc040 implemented glutTimerFunc 2004-01-15 08:30:05 +00:00
Daniel Borca
0849ed1275 documentation update 2004-01-15 07:17:31 +00:00
Daniel Borca
4d5e6623d3 _mesa_delete_texture_object and some other updates 2004-01-15 07:16:06 +00:00
Brian Paul
3663c0f825 Cosmetic changes.
Added a bunch of const qualifiers.
Use _mesa_memcpy() instead of memcpy(), etc.
2004-01-15 00:29:51 +00:00
Brian Paul
5bae6b90f9 change MALLOC to CALLOC to silence valgrind error in _playback_copy_to_current() 2004-01-15 00:09:01 +00:00
Brian Paul
4b603440f6 use -G not -shared for gcc on SunOS 2004-01-14 23:18:47 +00:00
Brian Paul
ae7666385d added blurb about NVIDIA extensions 2004-01-14 19:51:19 +00:00
Brian Paul
e6089db8c0 latest changes, bug fixes 2004-01-14 19:49:22 +00:00
Brian Paul
8533b91543 bump MAX_WIDTH/HEIGHT to 4K pixels 2004-01-14 19:48:58 +00:00
Karl Schultz
d48382c778 Generate mesa.def file for Windows. 2004-01-14 17:45:24 +00:00
Karl Schultz
c85f0fa177 Replace with version generated from new python script. 2004-01-14 17:38:14 +00:00
Keith Whitwell
eb7935c63b Fix up more confusions with count vs end in array functions 2004-01-14 10:52:51 +00:00
Daniel Borca
43ed92b3a1 fixed a bug in texture memory manager when in UMA mode 2004-01-14 07:10:12 +00:00
Michel Dänzer
067603db91 Fix initialisation of cubic tecture offsets (Andreas Stenglein) 2004-01-14 02:26:28 +00:00
Karl Schultz
5da27de003 add new entrypoints 2004-01-13 23:45:42 +00:00
Brian Paul
0ce75a77c0 tweak aix-gcc config 2004-01-13 23:39:34 +00:00
Ian Romanick
e54f260170 Added support for EXT_texture_mirror_clamp. 2004-01-13 16:21:06 +00:00
Brian Paul
b44d4a0d6a updated glext.h, fixed bug 876160 2004-01-13 16:18:33 +00:00
Brian Paul
a7e6f7ba35 exercise glDeleteProgramsARB 2004-01-13 16:17:21 +00:00
Brian Paul
7a28156666 glDeleteProgramsARB() failed for fragment programs (bug 876160) 2004-01-13 16:14:09 +00:00
Jouk Jansen
1e274517b8 Committing in .
optional compilation of progs/test/ since it seems not to appear in the
 releases.

 Modified Files:
 	Mesa/descrip.mms
 ----------------------------------------------------------------------
2004-01-13 16:04:46 +00:00
Daniel Borca
09a4fcb592 added support for textures bigger than HW can support (SW rescaling) 2004-01-13 08:47:44 +00:00
Daniel Borca
b005b8258d re-enabled trilinearness 2004-01-13 08:46:46 +00:00
Daniel Borca
d075366107 small fixes 2004-01-13 08:46:12 +00:00
Daniel Borca
66304ec6d1 updated FX wrapper 2004-01-13 08:24:43 +00:00
Ian Romanick
eba6bacc88 Removed some dead code. R128 does not (as far as I can tell) support
GL_ARB_texture_border_clamp.  The ATI drivers for Windows support it,
but I can see no way to make it work without a fallback.
2004-01-13 02:18:58 +00:00
Ian Romanick
3d8f7d4c8c Added some missing extension strings. 2004-01-13 02:15:29 +00:00
Brian Paul
cdde03efe2 remove stuff that's now in glext.h 2004-01-13 02:04:57 +00:00
Brian Paul
c661cccf37 updated to version 21 with OpenGL 1.5 support 2004-01-13 01:54:03 +00:00
Karl Schultz
c6c4cd8b6f silence compiler warnings 2004-01-13 01:11:09 +00:00
Karl Schultz
4f7a8f3a47 remove unused variable 2004-01-13 01:10:05 +00:00
Karl Schultz
1852f4fa33 change type of loop index var to remove compiler warning. 2004-01-13 01:09:17 +00:00
Karl Schultz
d575248903 add cast to quiet compiler warning 2004-01-13 01:08:23 +00:00
Karl Schultz
1c5a45eafe init an uninitialized variable. This doesn't fix a latent bug because
the variable was multiplied by zero.
2004-01-13 01:07:28 +00:00
Karl Schultz
9bb7a55de9 add casts to silence compiler warnings 2004-01-13 01:05:28 +00:00
Karl Schultz
d612d7e2ee add t_vertex.c to project 2004-01-13 00:24:03 +00:00
Karl Schultz
22e68de957 remove ss_vb.c from project 2004-01-13 00:23:31 +00:00
Keith Whitwell
8bec7c09bb Don't call _tnl_draw_range_elements() unless start == 0. 2004-01-12 23:21:54 +00:00
Ian Romanick
553a8e0e7b Removed redundant extension strings. The Mesa extension mechanism
automatically enables "duplicate" extensions without the driver
explicitly enabling them.
2004-01-12 22:50:01 +00:00
Brian Paul
e96d5b9846 latest bug fixes 2004-01-12 15:30:55 +00:00
Brian Paul
f7650b647a added note about mklib permissions 2004-01-12 15:30:42 +00:00
Brian Paul
a62bccff67 make executable 2004-01-12 14:52:21 +00:00
Daniel Borca
1b65e52fb1 Glide driver (windowed mode) fix for Voodoo2 2004-01-12 12:28:05 +00:00
Brian Paul
bf30122484 comment-out the touch/rm depend lines 2004-01-11 17:15:03 +00:00
Brian Paul
ebe0ca3937 change -O to -O2 for aix-gcc 2004-01-11 17:14:37 +00:00
Brian Paul
b673fc49b9 fix vertex program debugger issues (Bug 874382) 2004-01-11 16:48:14 +00:00
Brian Paul
8bc3ce92a2 call _mesa_delete_texture_object() from in the driver's DeleteTexture function 2004-01-11 16:27:53 +00:00
Brian Paul
add9f2168a add GL_TEXTURE_CUBE_MAP_ARB to _mesa_max_texture_levels(), reordered some comments 2004-01-11 16:21:13 +00:00
Michel Dänzer
4dd4ac3fc0 Actually disable HW TCL capability when SW TCL is forced.
+ remove some gratuitous whitespace
2004-01-11 13:10:08 +00:00
Brian Paul
b07430817c more aix-gcc tweaking 2004-01-11 00:05:34 +00:00
Brian Paul
da93ecd3ec aix-gcc tweaks 2004-01-10 22:42:34 +00:00
Brian Paul
e3cc5c31b9 removed MAKELIB lines. tweak openbsd config 2004-01-10 22:22:41 +00:00
Brian Paul
ff3515831e added OSMESA_LIB_DEPS needed for some platforms 2004-01-10 22:18:41 +00:00
Brian Paul
ae6c594908 added aix-gcc config 2004-01-10 22:14:51 +00:00
Brian Paul
12d6caea08 Use same steps for Linux and OpenBSD.
Added AIX/gcc support.
2004-01-10 22:12:21 +00:00
Brian Paul
cf75101bba regenerated to support new 1.5 functions, etc. 2004-01-09 20:34:04 +00:00
Brian Paul
bd09d49eb4 re-enable SSE code, except for the _mesa_sse_transform_points4_identity() function. Use the x86 version instead 2004-01-09 17:14:22 +00:00
Brian Paul
ed98b867af Change < to <= when testing counts against ctx->Const.MaxArrayLockSize,
per Daniel Borca.
Also, added XXX comments to mark where there may be a problem with the
calls to _tnl_vb_bind_arrays().  Is the last parameter a count or index?
2004-01-09 15:31:08 +00:00
Keith Whitwell
a05b1549f7 Roland Scheidegger's r200_changeemitorder.diff. 2004-01-09 09:28:40 +00:00
Felix Kuehling
0f47e002bc Fixed a few typos in the german translation. 2004-01-08 22:49:26 +00:00
Brian Paul
088eb4fb9b set StringPos field in parse_vp_instruction (Mesa bug 873011) 2004-01-08 14:23:42 +00:00
Jouk Jansen
332a6741d5 Committing in .
Update OpenVMS makefiles

 Modified Files:
 	Mesa/src/mesa/swrast_setup/descrip.mms
 	Mesa/src/mesa/tnl/descrip.mms
 ----------------------------------------------------------------------
2004-01-08 14:14:02 +00:00
Keith Whitwell
fb2a95b391 Perform check for dstclip[3] == 0. 2004-01-08 13:55:24 +00:00
Daniel Borca
2fa774edba keeping things safe: sanity check back 2004-01-08 09:04:27 +00:00
Daniel Borca
a71d4445b4 envvars to control run-time 2004-01-08 07:37:21 +00:00
Daniel Borca
1a2a1f039d updated makefiles 2004-01-08 07:36:37 +00:00
Daniel Borca
d994f6dda5 removed unnecessary (now) sanity check 2004-01-08 07:32:06 +00:00
Felix Kuehling
94de418fd0 Use hand-made number parsing functions as the libc routines are locale-dependent. Thanks to Pavel harry_x Palat for pointing that out. 2004-01-07 23:35:00 +00:00
Brian Paul
49bef526fd reindent the code 2004-01-07 15:18:17 +00:00
Brian Paul
d7af11a041 updates for 6.0 release 2004-01-07 14:51:30 +00:00
Daniel Borca
731852f8a1 bugfix in texture swapping mechanism (multitex) 2004-01-07 13:58:04 +00:00
Daniel Borca
6471160770 temporary workaround for bad primitives in fx_render_vb_quads 2004-01-07 13:57:23 +00:00
Daniel Borca
4c75d90ad2 protect against broken apps 2004-01-07 13:54:17 +00:00
Daniel Borca
63f025c5ad teensy bit of optimization in interp code 2004-01-07 12:50:30 +00:00
Daniel Borca
e1ecdc337e wgl interface 2004-01-07 12:49:47 +00:00
Daniel Borca
972f3ccedf cleanups 2004-01-07 12:49:22 +00:00
Daniel Borca
17f2e55009 sanity check for vertex counter 2004-01-07 12:39:45 +00:00
Daniel Borca
722cb89a13 no-op table on par with main dispatcher 2004-01-07 12:37:09 +00:00
Daniel Borca
ff1c766f7c Mingw3 prototypes 2004-01-07 12:34:28 +00:00
Keith Whitwell
203dca4287 Testing 2004-01-06 20:13:41 +00:00
Brian Paul
a48a280e27 added Aqsis link 2004-01-06 16:36:48 +00:00
Brian Paul
b4b04651f5 remove BMRT link 2004-01-06 15:33:48 +00:00
Keith Whitwell
85138fa443 Add comment regarding sse disable 2004-01-06 12:20:20 +00:00
Keith Whitwell
20caac0967 SSE segfaults in conform - disable for now. 2004-01-06 12:19:40 +00:00
Keith Whitwell
38bf45d4bb Fixes for _swsetup_Translate() 2004-01-06 00:18:23 +00:00
Keith Whitwell
44d4a8f645 Apply attribute offset when calling extract().
Simplify stride calcs.
2004-01-06 00:18:03 +00:00
Eric Anholt
10095c9024 Add support for Radeon IGP chipsets, based off of mcgrof-radeon-igp-v3.diff
XFree86 bug:	314
2004-01-05 23:19:21 +00:00
Brian Paul
283507075a added missing descrip.mms files to tar file list 2004-01-05 16:42:34 +00:00
Keith Whitwell
16f54219f5 Slight cleanup 2004-01-05 15:55:01 +00:00
Keith Whitwell
fc9f313b9d Remove debug 2004-01-05 15:31:22 +00:00
Keith Whitwell
588225770c Beef up t_vertex.c:
- cope with input vectors with size less than that of the emitted
	  attribute.
	- cope with vertices with 'holes' inside and between vertices.

Fix calculation of tnl->render_inputs to work with fp programs.
Mirror VB->PointSizePtr in VB->AttribPtr so that it can work with t_vertex.c.

Transition swrast_setup/ to use t_vertex.c to build swrast vertices.
2004-01-05 15:24:53 +00:00
Keith Whitwell
ce81fe69da Add t_vertex.c 2004-01-05 10:06:49 +00:00
Keith Whitwell
790734045b Re-commit t_vertex.[ch] changes to fd.o server. 2004-01-05 09:43:42 +00:00
Felix Kuehling
effc73931f Added def_max_anisotropy and no_neg_lod_bias options to radeon and r200.
The def_max_anisotropy option breaks driconf. :( I'm going to upload a
fixed version soon.
2004-01-05 02:40:28 +00:00
Felix Kuehling
dbfe7ae848 Added two new options: def_max_anisotropy and no_neg_lod_bias. The latter one
is for disabling faked "anisotropy" in e.g. FlightGear.
2004-01-05 02:35:45 +00:00
Felix Kuehling
22d1acf2ee New, less expensive workaround for state-change lockups. 2004-01-04 22:08:31 +00:00
Felix Kuehling
9741dd6cf4 Reenable the vtxfmt code paths in the radeon and r200 drivers. 2004-01-04 16:39:29 +00:00
Brian Paul
41c310b20a whitespace changes and new comments 2004-01-01 17:13:12 +00:00
Brian Paul
4d1b773dd3 latest updates 2004-01-01 15:18:50 +00:00
Brian Paul
d7a3b7e27b added -fPIC -fomit-frame-pointer etc to sunos5-gcc configs (bug 868737) 2004-01-01 15:17:20 +00:00
Brian Paul
fc528e27c6 added info about S3TC texture compression 2003-12-31 20:59:51 +00:00
Brian Paul
1fdfd54ba2 updated CVS info 2003-12-31 20:47:37 +00:00
Felix Kuehling
2788927410 Fix TCL_LIGHT_MODEL_CTL setting in radeonColorMaterial. 2003-12-28 15:07:38 +00:00
Keith Whitwell
7a57932a02 Don't allow lighting in model coordinates when fog is active,
from radeon_state.c, noticed by Dieter Nuetzel.
2003-12-27 22:06:39 +00:00
Keith Whitwell
eff4abcbd8 Correct sense of ctx->_ForceEyeCoords (Felix Kuhling) 2003-12-27 20:03:26 +00:00
Brian Paul
f903e1142d the optimized UNCLAMPED_FLOAT_TO_UBYTE macro was broken 2003-12-23 21:43:54 +00:00
Daniel Borca
0ee5f6203c reverted TMUs for proper multitexturing 2003-12-23 14:11:22 +00:00
Keith Whitwell
fabb9734dd new files 2003-12-21 17:54:31 +00:00
Brian Paul
259b880bc7 Version bumps, etc for Mesa 6.0 2003-12-21 04:06:31 +00:00
Daniel Borca
e9e98405e7 DMesa: removed MGA2064W driver
DMesa: added capability to query visuals
fxMesa: WGL_3DFX_gamma_control
fxMesa: minor fixes to interface (fxQueryHardware vs fxMesaSelect...)
2003-12-19 11:26:46 +00:00
Brian Paul
eee77bf82f added link to RELNOTES-5.1 2003-12-18 00:42:16 +00:00
Brian Paul
9ccc84160b added MD5 checksums for 5.1 tarballs 2003-12-18 00:32:05 +00:00
Brian Paul
ede655c230 updates for 5.1 release 2003-12-17 23:54:23 +00:00
Ian Romanick
63a5cbb177 Fix to work with the C preprocessor in GCC 3.3.x. 2003-12-17 21:35:44 +00:00
Brian Paul
829adaee79 updated location of config.h 2003-12-17 15:14:31 +00:00
Brian Paul
65aeac065c s/Makefile.X11/Makefile.solo/ for make clean 2003-12-17 15:11:41 +00:00
Brian Paul
63f4e198b4 fix GL_MIN/MAX w/ glBlendFuncSeparate bug (Ian Romanick) 2003-12-15 18:04:17 +00:00
Brian Paul
b3b725b1e6 Assorted mklib tweaks.
Added Intel icc support to mklib.
2003-12-15 16:14:55 +00:00
Daniel Borca
f80220d050 EXT_secondary_color and EXT_separate_specular via multipass 2003-12-15 10:38:12 +00:00
Karl Rasche
7aa77b679d Problem computing specular value in OPCODE_LIT - pulled in value from
vertex program execution of LIT
2003-12-13 15:12:58 +00:00
Brian Paul
79ce209553 fixed bad touch command 2003-12-13 01:58:41 +00:00
Brian Paul
82e9f0099d fix some matypes.h glitches 2003-12-13 01:58:20 +00:00
Brian Paul
3c7b7df6d5 call _ae_destroy_context() and _ae_invalidate_state() from the proper places 2003-12-13 01:55:49 +00:00
Brian Paul
c360a721e7 init vars to silence warnings 2003-12-13 01:35:33 +00:00
Brian Paul
e39e7bc17c added BeOS files, src/mesa/sources file 2003-12-13 01:33:36 +00:00
Brian Paul
50f20ec7f5 Updates from Philippe Houdoin. 2003-12-13 01:26:14 +00:00
Alan Hourihane
3b81ccd826 fix for C++ 2003-12-12 22:35:02 +00:00
Brian Paul
74466be8cb check swrast->NewState in Draw/CopyPixels functions 2003-12-12 20:19:13 +00:00
Brian Paul
4a3110fb21 remove TexCoordInterleaveFactor. Clean up _mesa_InterleavedArrays() 2003-12-12 18:40:02 +00:00
Brian Paul
d450d0b0e2 applied Felix's patch for configuration system 2003-12-12 16:38:57 +00:00
Karl Rasche
177db2bc9b - Test instruction count
- Throw an error for VPs if we set position invariance and then write to the output position
2003-12-12 16:30:15 +00:00
Brian Paul
d7a2a7f4a8 updated list of files 2003-12-12 15:44:11 +00:00
Brian Paul
9cefb392bc uncomment-out tdfx driver 2003-12-12 15:39:30 +00:00
Brian Paul
520ef4b5bc new makefiles 2003-12-12 15:33:51 +00:00
Brian Paul
c882e19643 makefile improvements 2003-12-12 15:32:25 +00:00
Brian Paul
ecc150c626 improved makefiles 2003-12-12 15:31:50 +00:00
Brian Paul
107564b090 lists of common source files 2003-12-12 15:31:17 +00:00
Brian Paul
b8cbca4807 new Makefiles 2003-12-12 15:30:52 +00:00
Keith Whitwell
013056ac65 set MaxTextureImageUnits, MaxTextureCoordUnits 2003-12-12 10:06:02 +00:00
Daniel Borca
e01d671668 small bug wrt culling 2003-12-12 08:19:20 +00:00
Brian Paul
379641956d fix visinfo typo 2003-12-12 00:08:01 +00:00
Brian Paul
a9a1c3f20f check for null dpy in Fake_glXGetConfig() 2003-12-12 00:01:17 +00:00
Brian Paul
c3fb2558f0 replace gl/mesa_wgl.h with GL/mesa_wgl.h (Simon Goodall) 2003-12-11 23:55:55 +00:00
Keith Whitwell
d8be4a54fa Don't evaluate GET_CURRENT_VB_MAX_VERTS() until after calling INIT() 2003-12-11 20:49:59 +00:00
Keith Whitwell
7ed58285ab add driClipRectToFramebuffer helper function 2003-12-11 19:06:32 +00:00
Keith Whitwell
844cdaf461 Updates to tnl_dd_dmatmp.h
- Allocate vertices explicitly, rather than trying to talk
	  about dma buffers.
	- Clean up the various Flush() operations.
	- Don't allow fallbacks any longer.  Provide a support function
	  to detect them ahead o ftime
Updates to tnl_dd_vbtmp.h
	- Get rid of power-of-two vertex strides.  Pack all vertices tightly.
	- Get texunit 2,3 emit working coorrectly.
Other stuff:
	- Get rid of lingering Ubyte color support.
	- Fix a few compiler warnings.
2003-12-11 16:49:55 +00:00
Keith Whitwell
2dc621f3fd Updates to tnl_dd_dmatmp.h
- Allocate vertices explicitly, rather than trying to talk
	  about dma buffers.
	- Clean up the various Flush() operations.
	- Don't allow fallbacks any longer.  Provide a support function
	  to detect them ahead o ftime
Updates to tnl_dd_vbtmp.h
	- Get rid of power-of-two vertex strides.  Pack all vertices tightly.
	- Get texunit 2,3 emit working coorrectly.
Other stuff:
	- Get rid of lingering Ubyte color support.
	- Fix a few compiler warnings.
2003-12-11 16:25:36 +00:00
Daniel Borca
5bcf52b4d6 fixed prototypes for wglGammaRamp3DFX 2003-12-11 16:16:33 +00:00
Keith Whitwell
e0ee87422b Quash annoying compiler warning 2003-12-11 15:47:43 +00:00
Keith Whitwell
a9fc4b1b1c Remove dead file glcore-new.h 2003-12-11 13:10:20 +00:00
Alan Hourihane
2ed4797848 fix from DRI trunk 2003-12-10 19:12:49 +00:00
Daniel Borca
2844285297 got rid of __FUNCTION__ :(
Texus2 functions are dynamically linked now
made getRegistryOrEnvironmentString more portable
bugfix: unnecessary total SW fallback -- glColorMask
bugfix: when shared palette was not loaded correctly
point_attenuation_stage back in business (point size/atten)
fxTexGetInfo is not required for fxIsTexSupported
fxDDChooseTextureFormat optimized for RGB/RGBA textures
accelerated Quads with Triangle_Fans
more WGL extensions/functions (also updated export file)
DXTC/S3TC -> FXT1 wrapping hack
quick & dirty fix for Quake2
2003-12-10 15:24:49 +00:00
Alan Hourihane
43be8ee414 fix typo 2003-12-10 14:10:45 +00:00
Brian Paul
13861dbff9 added fbdev/glfbdev.c to tarball list 2003-12-10 02:44:38 +00:00
Eric Anholt
527078afca Fix definitions for Intel compiler.
Submitted by:	Mikhail Teterin <mi@FreeBSD.org>
2003-12-09 23:59:16 +00:00
Keith Whitwell
b44fb35770 In fact, bring all the changes from mesa/tnl_dd to mesa/drivers/common. 2003-12-09 19:35:45 +00:00
Keith Whitwell
10637fed22 Remove old ubyte-color support code. Update interp, copy_pv for float
colors in VB arrays.
2003-12-09 19:30:22 +00:00
Karl Rasche
2e5ec27845 Arg. I can't code.. Test that we don't recongnize '0' as having a leading zero.. 2003-12-09 19:14:41 +00:00
Karl Rasche
a8a4ad452e added parsing exercises for ARL and relative offsets in ARB_vp 2003-12-09 18:17:04 +00:00
Karl Rasche
ff10a796fe - New grammar (0.5) from Michal Krol, merges many opcodes and adds range testing
- Proper header on arbparse_syn.h
 - Handling of relative offsets for ARB_vp
 - s/MaxFragment/MaxVertex
 - Check for leading 0's in the fraction portions of floats in parse_float()
2003-12-09 18:13:12 +00:00
Karl Rasche
057dfcb06c - handle IsPositionInvariant
- tweak assertion to allow for relative offets from ARB_vp
2003-12-09 18:04:52 +00:00
Keith Whitwell
82efdff66f Fix typo. 2003-12-09 16:22:33 +00:00
Keith Whitwell
8069ada29b MGA only has one vertex format. 2003-12-09 16:21:31 +00:00
Keith Whitwell
9556a52867 Fix VERT_SET_RGBA, VERT_SET_SPEC macros to account for change to floating
point colors throughout mesa.
2003-12-09 16:14:24 +00:00
Keith Whitwell
425deefdd0 Fix VERT_SET_RGBA, VERT_SET_SPEC macros to account for change to floating
point colors throughout mesa.
2003-12-09 16:09:24 +00:00
Keith Whitwell
8592ba94b8 Fix use of uninited value 'flags', removed unused vars. 2003-12-09 16:02:43 +00:00
Keith Whitwell
c4f7de5d78 Fix VERT_SET_RGBA, VERT_SET_SPEC macros to account for change to floating
point colors throughout mesa.
2003-12-09 16:00:38 +00:00
Keith Whitwell
4790914198 Fix incorrect removal of PRIM_PARITY code (ie remove the parity code, not the
non-parity code).
2003-12-09 15:33:45 +00:00
Keith Whitwell
6881938007 Call UpdateMaterials when they have changed 2003-12-09 14:19:41 +00:00
Keith Whitwell
a70fa7129c clean up some compiler warnings 2003-12-09 14:18:41 +00:00
Keith Whitwell
8a340279f4 No need to call UpdateMaterial() from RunPipeline(). 2003-12-09 14:18:18 +00:00
Keith Whitwell
e6abd5c415 No need to call radeonUpdateMaterial() from RunPipeline(). 2003-12-09 14:17:40 +00:00
Keith Whitwell
48383f10c9 Remove $Id tag 2003-12-09 11:54:50 +00:00
Jouk Jansen
7ac9133627 Committing in .
Small VMS issue : sys/param.h is not available on all systems and not
                   needed anyway.

 Modified Files:
 	Mesa-newtree/src/mesa/main/vsnprintf.c
 ----------------------------------------------------------------------
2003-12-09 10:11:27 +00:00
Brian Paul
853bda3e7c Update NEED_SECONDARY_COLOR macro to test if either vertex/fragment
programs are enabled and if they need secondary color input register.
Patch by Karl Rasche, with tweaks by Brian.
2003-12-09 01:53:03 +00:00
Eric Anholt
e8bec8832b Remove usleeps from sis driver. We probably aren't doing anyone a service
sleeping with the lock held.  Also, rename cEngineState to engineState since
it isn't a char any more.
2003-12-09 00:00:40 +00:00
Alan Hourihane
73c3c397e4 fix bogus assertion that checked for an empty texture heap list before
deleting the textures. Essentially move the assertion after the destruction
of the heap.
2003-12-08 22:43:10 +00:00
Karl Rasche
93c2dacca6 A quick little test to show disapeearing specular color between vertex and fragment program execution 2003-12-08 21:43:55 +00:00
Keith Whitwell
6b9e8279dd Provide dummy definitions of __driConfig externs 2003-12-08 17:32:58 +00:00
Alan Hourihane
f7c17fef74 turn on tdfx in SOLO build 2003-12-08 17:27:33 +00:00
Alan Hourihane
1cb5d2e01a some changes for SOLO build 2003-12-08 17:26:59 +00:00
Alan Hourihane
8ed3231669 build in SOLO environment 2003-12-08 17:14:47 +00:00
Alan Hourihane
243093f544 kill a warning 2003-12-08 17:07:41 +00:00
Alan Hourihane
18343db1d8 reverse Keith's 'XFree86Server' glue. 2003-12-08 16:57:21 +00:00
Keith Whitwell
3abad78e26 Can't include <stddef.h> when building XFree86 server - define
ptrdiff_t to int instead
2003-12-08 15:00:24 +00:00
Keith Whitwell
07851ca039 get ffb compiling 2003-12-08 13:33:07 +00:00
Keith Whitwell
c11039979c get tdfx compiling 2003-12-08 13:21:22 +00:00
Daniel Borca
8fee8dfcaa fixed a bug in texgen (T coord for GL_REFLECTION_MAP_NV) 2003-12-08 13:00:50 +00:00
Keith Whitwell
034da5d817 Remove PRIM_PARITY reference 2003-12-08 12:32:50 +00:00
Jouk Jansen
58f88a29d2 Committing in .
OpenVMS compile issues

 Modified Files:
 	Mesa-newtree/progs/tests/cva.c
 	Mesa-newtree/progs/tests/dinoshade.c
 	Mesa-newtree/progs/tests/multipal.c
 	Mesa-newtree/src/mesa/main/descrip.mms
 	Mesa-newtree/src/mesa/tnl/descrip.mms
 	Mesa-newtree/src/mesa/tnl/t_vtx_api.c
 ----------------------------------------------------------------------
2003-12-08 09:03:35 +00:00
Jouk Jansen
2799d2535a Committing in .
Solves array boundary out of bound which causes problems on OpenVMS (and
   maybe other systems)

 Modified Files:
 	Mesa-newtree/src/mesa/tnl/t_vb_lighttmp.h
 	Mesa-newtree/src/mesa/tnl/t_vtx_eval.c
 ----------------------------------------------------------------------
2003-12-08 08:58:52 +00:00
Alan Hourihane
173f9ae031 add SETPARAM ioctl 2003-12-08 00:43:34 +00:00
Alan Hourihane
99ef0a0329 merge some more of the radeon DRI driver from the DRI trunk 2003-12-07 23:53:32 +00:00
Alan Hourihane
273e52f86f sync some more of the r200 driver from the DRI trunk 2003-12-07 23:47:56 +00:00
Alan Hourihane
297807d431 merge i830 DRI driver from DRI trunk 2003-12-07 23:40:13 +00:00
Brian Paul
a5a7d208c4 added drivers/fbdev/glfbdev.c 2003-12-06 17:59:08 +00:00
Brian Paul
8172cec943 conditionally define GLAPIENTRYP to prevent some warnings in linux-solo 2003-12-06 17:58:30 +00:00
Brian Paul
1a644b333c tweaks for SunOS 2003-12-06 17:57:12 +00:00
Brian Paul
99cfc4ecbc Basic info about the glFBDev interface/driver. 2003-12-06 17:26:50 +00:00
Brian Paul
a763123b35 glFBDev driver from embedded-2 branch.
Probably won't be actively used/maintained, but bring it to the trunk so
it doesn't get lost.
2003-12-06 17:20:10 +00:00
Brian Paul
fde2b9750e basic API work for FBConfigs & Pbuffers 2003-12-06 17:17:42 +00:00
Keith Whitwell
fe54ba3952 Relax assertion to account for empty primitives. 2003-12-06 12:58:47 +00:00
Brian Paul
78c5841364 s/APIENTRY/GLAPIENTRY/ for 1.5 functions 2003-12-06 01:49:54 +00:00
Alan Hourihane
cc14011596 fix _SOLO build problem 2003-12-05 22:35:57 +00:00
Alan Hourihane
87ae8db374 fix a _SOLO build problem 2003-12-05 22:34:11 +00:00
Alan Hourihane
e616ad78d8 fix _SOLO build problem 2003-12-05 22:26:35 +00:00
Alan Hourihane
e412eef73f fix some _SOLO build problems 2003-12-05 22:24:31 +00:00
Alan Hourihane
d907a75498 xmlconfig fixes 2003-12-05 22:12:07 +00:00
Alan Hourihane
e4b5ff8e77 xmlconfig fixes for the new options 2003-12-05 22:11:15 +00:00
Alan Hourihane
94965f2738 merge r128 DRI driver from DRI trunk 2003-12-05 11:51:39 +00:00
Alan Hourihane
98165fb1cf merge i810 DRI driver from DRI trunk 2003-12-05 11:47:35 +00:00
Alan Hourihane
a87bf1599c fix compiler warning 2003-12-05 11:25:15 +00:00
Alan Hourihane
c0b0b1790a remove duplicate declarations 2003-12-05 11:22:07 +00:00
Keith Whitwell
fcf02034b4 Backout last change on the displaylist path to fix gears (and probably
everything else).
2003-12-05 08:57:25 +00:00
Brian Paul
b25439a3bc include glheader.h first, to prevent warnings about GLAPIENTRYP being redefined 2003-12-05 00:48:37 +00:00
Brian Paul
dd7f735f53 don't include GL/gl.h, define GLAPIENTRYP if not defined 2003-12-05 00:46:06 +00:00
Brian Paul
a6ad01c14e Fix a front/back CopyPixels glitch. 2003-12-05 00:44:01 +00:00
Brian Paul
15f7f4e31f press f key to toggle front/back drawing/copying 2003-12-05 00:39:48 +00:00
Alan Hourihane
eed5ac284c bring over latest mga DRI driver from DRI trunk 2003-12-05 00:32:15 +00:00
Alan Hourihane
1f2d9ae69f bring in common from DRI trunk 2003-12-05 00:19:32 +00:00
Alan Hourihane
0cbb006942 disable some DEBUG 2003-12-04 23:24:12 +00:00
Karl Schultz
f9b0ac691c Windows needs to #define GL_GLEXT_PROTOTYPES 2003-12-04 21:03:08 +00:00
Karl Schultz
9b9a57a25c Change
#define GLAPIENTRYP __stdcall *
to
#define GLAPIENTRYP GLAPIENTRY *
These two defs end up doing the same thing, but the compiler can squawk
because they look different.  Also matches the way it is declared in gl.h.
Do same for GLCALLBACKP.
2003-12-04 20:55:58 +00:00
Karl Schultz
fed1cda2ad update files 2003-12-04 20:44:49 +00:00
Karl Schultz
44c00033f2 Add missing GLAPIENTRY 2003-12-04 20:43:24 +00:00
Karl Schultz
d6745697b6 Add missing GLAPIENTRY 2003-12-04 20:23:44 +00:00
Alan Hourihane
ddd3fad6e5 use _swrast_CopyPixels for XFree86 2003-12-04 20:10:54 +00:00
Alan Hourihane
e78dd78e4a merge latest DRI sis driver changes from the DRI trunk 2003-12-04 18:17:32 +00:00
Alan Hourihane
ecb1a5f7f9 build fix 2003-12-04 16:58:29 +00:00
Alan Hourihane
21a218f5bf build fixes 2003-12-04 16:57:43 +00:00
Alan Hourihane
164c703e98 build fixes 2003-12-04 16:38:05 +00:00
Alan Hourihane
4abac931e8 build fixes 2003-12-04 16:07:17 +00:00
Alan Hourihane
faf4059aa8 check if GLAPIENTRYP is already set 2003-12-04 15:59:41 +00:00
Alan Hourihane
f82c775fff #define GLAPIENTRYP GLAPIENTRY * 2003-12-04 15:59:03 +00:00
Brian Paul
1d7b75c3ad don't use new glDrawPixel routines in Xserver 2003-12-04 15:29:10 +00:00
Alan Hourihane
8ea178d68f remove duplicate declaration 2003-12-04 14:30:53 +00:00
Alan Hourihane
b97faf113d build fixes 2003-12-04 14:04:35 +00:00
Alan Hourihane
4e638426fd build fix 2003-12-04 14:00:56 +00:00
Alan Hourihane
84f6b5206f build fixes 2003-12-04 13:40:28 +00:00
Alan Hourihane
13e6a4849c add SPARC ffb DRI driver 2003-12-04 13:38:06 +00:00
Alan Hourihane
15af25aca0 build fixes 2003-12-04 13:28:10 +00:00
Alan Hourihane
e05ab2795b add tdfx DRI driver 2003-12-04 13:27:05 +00:00
Alan Hourihane
3eb58b4c1e bring over glcore.h changes from DRI trunk 2003-12-04 12:33:15 +00:00
Brian Paul
b305028464 Port over changes from XFree86/Mesa 5.0.2, mostly to silence compiler warnings. 2003-12-04 03:19:46 +00:00
Brian Paul
03e29a5f77 Fix some problems with glDrawElements and vertex buffer objects. 2003-12-04 03:16:27 +00:00
Keith Whitwell
6ff60049a4 Ensure PRIM_BEGIN marker isn't lost when incomplete primitives are wrapped. 2003-12-03 10:15:17 +00:00
Karl Rasche
9b0dcfd408 s/inverse/invtrans.. whoopsie 2003-12-02 22:46:30 +00:00
Karl Rasche
ce0f8fef86 Remove things having to do with ARB_matrix_palette/ARB_vertex_blend 2003-12-02 22:41:45 +00:00
Brian Paul
80e89c5368 added description of faster glDraw/CopyPixels code 2003-12-01 22:43:31 +00:00
Brian Paul
9a90cd40c6 fix __sparc_v9__ test to exclude linux (bug 852204) 2003-12-01 22:40:26 +00:00
Brian Paul
06cfb44564 updated list of files since merging vtx branch 2003-12-01 22:33:07 +00:00
Brian Paul
870a9acd02 s/texUnit->Enabled/enableBits/ (Karl Rasche) 2003-11-30 19:55:13 +00:00
Karl Rasche
1df1547f9e Fixed compiler warnings
Assign the correct thing to TexturesUsed[]
2003-11-30 15:59:28 +00:00
Brian Paul
de0dd65aee Use XPutImage() for glDrawPixels() and XCopyArea() for glCopyPixels() when
possible (when pixel formats match and drawing to front buffer with no
raster operations).
Results in 10-100x speed-up when applicable.
2003-11-29 19:36:08 +00:00
Brian Paul
e90de7883a Fix generic/conventional vertex array glitches.
Changed _NEW_ARRAY_ATTRIB_0 back to 0x10000 so that the conventional and
generic enable bits do not alias.
In ac_import.c test Array.Normal.Enabled instead of Array._Enabled & _NEW_ARRAY_COLOR0, etc.
In t_array_import.c give priority for generic arrays over conventional
arrays on an individual basis, not all or none.
2003-11-29 19:33:33 +00:00
Brian Paul
afb6fe034c more tweaks to error checking and reporting 2003-11-28 21:06:40 +00:00
Brian Paul
deb4a63a86 if id==0 in glGetQueryObject, raise GL_INVALID_OPERATION 2003-11-28 20:30:36 +00:00
Brian Paul
c99e2dd1d3 fix an error test 2003-11-28 18:18:50 +00:00
Brian Paul
ba9dc7ecf3 updated NetReality -> Pansophica 2003-11-28 15:06:02 +00:00
Keith Whitwell
326bc7150d Save and restore front colors on backfacing triangles rather than trying to
pull them again from the VB pointers.  Avoids stride issues.
2003-11-28 09:43:18 +00:00
Brian Paul
acbc1e0c91 added link to Chromium 2003-11-26 18:10:31 +00:00
Brian Paul
69449a9d51 updated CVS info 2003-11-26 18:10:19 +00:00
Daniel Borca
854b4a3b54 accomodate vtx-0-2-branch 2003-11-26 08:32:35 +00:00
Brian Paul
0f3cd3f894 current raster color index should be GLfloat 2003-11-25 22:45:59 +00:00
Brian Paul
7df4f95314 added SoftGL link 2003-11-25 21:13:26 +00:00
Brian Paul
7939ed0e8e Otto Solares' patch to add radeon 9200 2003-11-25 16:45:33 +00:00
Brian Paul
8236a534b7 fix assorted g++ warnings 2003-11-25 16:39:31 +00:00
Brian Paul
2c9f50dd4a casts for g++ 2003-11-25 16:21:51 +00:00
Brian Paul
3bc7f3f864 fix a lot of warnings found with g++ 2003-11-25 16:18:31 +00:00
Brian Paul
97d8a35fa8 silence a warning 2003-11-25 16:02:39 +00:00
Brian Paul
47b0bc1a36 remove __FUNCTION__ hack 2003-11-25 16:02:24 +00:00
Brian Paul
4ccbe9e666 added a cast 2003-11-25 16:00:25 +00:00
Brian Paul
b65bc4f87b Remove unnecessary usage of __FUNCTION__.
#define MESA_FUNCTION to __FUNCTION__ if MESA_DEBUG is defined.
2003-11-25 15:58:22 +00:00
Karl Rasche
e749be22b0 - New version of the syntax rules from Michal Krol
+ Handles '1' as a float, just like '1.'
   + Remove switch collision between vp and fp #defines
   + result.color.xyz no longer requires result.color.primary.xyz
2003-11-25 02:08:05 +00:00
Karl Rasche
9bc3753a51 added support for generic vertex attributes (ARB_vp) and their error checking 2003-11-25 00:04:36 +00:00
Brian Paul
18199d3954 updated after APIspec fixes 2003-11-24 23:14:53 +00:00
Brian Paul
2171fadc26 oops, fix glitches in 1.5 functions 2003-11-24 23:03:29 +00:00
Brian Paul
e1a107c4e7 minor cast fixes 2003-11-24 22:32:16 +00:00
Brian Paul
62b6eb320e generate the OpenGL 1.5 entrypoints 2003-11-24 22:30:32 +00:00
Brian Paul
76f51ca9ea updated list of new/old src files 2003-11-24 17:13:10 +00:00
Brian Paul
b52559eb8c set the VB->FogCoordPtr with the other legacy pointers 2003-11-24 17:00:03 +00:00
Brian Paul
c515f90ec3 fix YCBCR assertion and disable assertion in auto-mipmap code 2003-11-24 16:51:26 +00:00
Keith Whitwell
7f28ab7d24 remove dead files 2003-11-24 15:42:24 +00:00
Brian Paul
8a299e7888 whitespace and comment changes 2003-11-24 15:41:39 +00:00
Brian Paul
7e86eb991b minor error string improvement 2003-11-24 15:40:52 +00:00
Brian Paul
0dde1904c8 added GL_ARB_vertex/fragment_program and new vertex code 2003-11-24 15:39:55 +00:00
Keith Whitwell
ae0eaf93e0 Merge vtx-0-2-branch 2003-11-24 15:23:18 +00:00
Keith Whitwell
57c9814b9e Import vtx-0-2-branch 2003-11-24 15:21:14 +00:00
Keith Whitwell
5b5cf9cb8b Remove a lot of rcs tags, avoid merge conflicts 2003-11-24 15:19:27 +00:00
Karl Rasche
dda09a6154 Moving NV_fragment_program tests to ARB_fragment_program 2003-11-24 13:29:54 +00:00
Karl Rasche
79e0dad79e - parse_alias() Was totally borked
- forgot a ++ in texSrcBit switch
- copy/paste error in arbfragparse.c
2003-11-23 19:29:18 +00:00
Karl Rasche
4eebfa14e7 - Create a dummy program to keep from segfaulting when parsing
fails
	- Change to grammar .emit to fix single LOCAL/ENV param usage
2003-11-23 17:54:39 +00:00
Karl Rasche
15955f1c5e Porting NV_vertex_program demos to ARB_vertex_program 2003-11-23 17:48:15 +00:00
Karl Rasche
4814d79c99 Porting NV_vertex_program tests to ARB_vertex_program 2003-11-23 17:44:02 +00:00
Brian Paul
91b6a4aa90 include malloc.h to get ptrdiff_t for vertex buffer object's GLintptr 2003-11-23 16:22:54 +00:00
Keith Whitwell
8525fae3b8 build fixes, rh9 2003-11-23 10:27:10 +00:00
Brian Paul
67f8a1d4ad added OpenGL 1.5 tokens and functions not yet put into glext.h 2003-11-22 18:44:10 +00:00
Brian Paul
4774cd9568 pass ctx to fetch_vector4_deriv() 2003-11-22 18:29:43 +00:00
Brian Paul
96ad2cde2c GL_ARB_point_sprite is not part of 1.5 2003-11-22 18:28:21 +00:00
Daniel Borca
533733d1d4 updated core makefiles to include arbparse 2003-11-22 11:27:33 +00:00
Brian Paul
a1769b0287 fix some bugs in computation of DDX, DDY commands 2003-11-21 20:48:16 +00:00
Brian Paul
b9c5672d22 s/byte/GLubyte/ and other minor clean-ups 2003-11-21 17:07:59 +00:00
Brian Paul
6d66ba171e reformat comments for 80-column viewing 2003-11-21 16:50:03 +00:00
Brian Paul
ba254c08c0 fix a bunch of warnings 2003-11-21 16:38:56 +00:00
Daniel Borca
663a9e1b7e more texture compression 2003-11-21 09:56:50 +00:00
Jouk Jansen
8b07e9d8a4 Committing in .
- Added arbparse.c to OpenVMS makefile
   - Added 2 type casts in a strcmp call to make my compiler happy.

 Modified Files:
 	Mesa-newtree/src/mesa/main/arbparse.c
 	Mesa-newtree/src/mesa/main/descrip.mms
 ----------------------------------------------------------------------
2003-11-21 08:24:40 +00:00
Karl Rasche
a6a4257f76 Caught missing parse_color_type() [Jacob Jansen] 2003-11-21 01:22:46 +00:00
Daniel Borca
08e6fb367e texture compression testbed 2003-11-20 17:07:31 +00:00
Daniel Borca
c07cd5b99f small matters 2003-11-20 17:05:56 +00:00
Karl Rasche
00ad4e109a Initial checkin of new ARB frag/vertex program parser 2003-11-19 13:21:20 +00:00
Karl Rasche
75b5cb4317 Initial checkin of new ARB_frag/vertex program parser 2003-11-19 13:17:33 +00:00
Karl Rasche
1c27a1e957 Initial checking of new ARB_frag/vertex program parser 2003-11-19 13:15:13 +00:00
Daniel Borca
ef563d011b doc updates; GLUT timer additions; fixed compilation warnings 2003-11-18 12:18:13 +00:00
Brian Paul
aa0d6dcd65 added reference to original half/float conversion code 2003-11-18 03:44:53 +00:00
Brian Paul
10b09212e8 added missing <type> error checking in read_index_pixels() 2003-11-18 03:42:17 +00:00
Brian Paul
7eb3e9b964 Some groundwork for supporting GLhalf datatype. 2003-11-18 03:41:14 +00:00
Brian Paul
56fe4dc391 fix comments about Cr==V, Cb==U 2003-11-18 00:48:24 +00:00
Brian Paul
a4e65d69dc fix texgen bug 597589 2003-11-17 15:15:18 +00:00
Brian Paul
16c119bab2 remove GL_GLEXT_LEGACY 2003-11-13 23:09:43 +00:00
Brian Paul
0ce7d7725a added glAccum bug fix 2003-11-13 22:24:36 +00:00
Brian Paul
3a0e0b284f no-op glAccum in selection/feedback mode (per Mark Kilgard's updates to the 1.5 spec) 2003-11-13 22:16:45 +00:00
Daniel Borca
af6162e340 vanilla extensions disabled 2003-11-13 16:27:25 +00:00
Brian Paul
34a8bf5135 added Ville's RGBA blend fix 2003-11-12 15:39:13 +00:00
Brian Paul
6eb2547317 updated 5.0.2 tarballs 2003-11-12 15:32:57 +00:00
Brian Paul
57857ca092 Ville Syrjala's logic op patch 2003-11-12 15:27:52 +00:00
Daniel Borca
80ee4b1e9d dirty hack to advertise vanilla extension names 2003-11-12 11:55:21 +00:00
Brian Paul
a2b9bad251 Redo array element checking for vertex array buffers.
Now, compute ctx->Array._MaxElement as the min of enabled array's max element.
Test against ctx->Array._MaxElement in glDrawArrays/Elements.
Note: testing in glArrayElement not done yet.
Only do element checking if ctx->Const.CheckArrayBounds is set.
2003-11-10 19:08:37 +00:00
Brian Paul
5e99ad19f5 s/GGIMesaContext/ggi_mesa_context_t/ 2003-11-07 17:28:46 +00:00
Brian Paul
33267a41e0 fix comments 2003-11-07 17:28:24 +00:00
Brian Paul
666b0a3f6e added glTexSubImage3D bug 2003-11-07 14:53:17 +00:00
Brian Paul
c5853c63d0 s/xoffset/zoffset/ (Cedric Gautier) 2003-11-07 14:52:09 +00:00
Daniel Borca
d96651bdc5 NCC fixes and some cosmetics 2003-11-07 13:17:21 +00:00
Brian Paul
e83cf6ddf2 added wgl bug fix 2003-11-04 23:38:33 +00:00
Brian Paul
afa6e978b9 fix AccessViolation bug (#835861) 2003-11-04 23:37:53 +00:00
Brian Paul
f023391e1a another tweak from Matt Sealey 2003-11-03 21:59:36 +00:00
Daniel Borca
0768744fde small fixes wrt texture handling 2003-11-03 12:16:22 +00:00
Daniel Borca
ef387549bd small fixes wrt texture handling 2003-11-03 12:13:23 +00:00
Daniel Borca
313e12e058 Voodoo2 happiness 2003-11-03 12:01:03 +00:00
Daniel Borca
7093114285 accomodate decorated names 2003-11-03 12:00:24 +00:00
Daniel Borca
f807a35cd2 removed detritus 2003-10-31 11:07:39 +00:00
Daniel Borca
e81b180065 bugfixes wrt texture compression 2003-10-30 11:44:19 +00:00
Daniel Borca
63a5ca08f3 changes to accomodate texture compression 2003-10-29 14:40:43 +00:00
Daniel Borca
40bd9d0b19 texture compression 2003-10-29 14:35:31 +00:00
Brian Paul
e96a121010 prefix MAKELIB with TOP in default case (Matt Sealey) 2003-10-27 20:04:43 +00:00
Brian Paul
20f40fa427 minor fix to glutSetColor prototype (Evgeny Kotsuba) 2003-10-27 18:33:34 +00:00
Brian Paul
73d4f69283 Pass $(MKLIB_OPTIONS) to mklib script to allow setting extra options. 2003-10-27 18:24:37 +00:00
Brian Paul
65e2ab3903 added MorphOS instructions (Matt Sealey) 2003-10-27 18:13:37 +00:00
Jon Smirl
b55921db48 Fix for missing GLAPIENTRYP definition 2003-10-24 20:44:55 +00:00
Daniel Borca
c0d83cd054 entrypoints... again 2003-10-23 13:57:31 +00:00
Daniel Borca
79fa6b9881 more MinGW fixes 2003-10-23 13:28:05 +00:00
Brian Paul
76692c5ce2 s/GLuint */GLvoid */ 2003-10-23 12:19:10 +00:00
Daniel Borca
3fe2af23ef added a few missing GLAPIENTRYs to make MinGW compile again 2003-10-23 12:02:36 +00:00
Brian Paul
c5b1e81de4 Initial work for bounds checking of vertex arrays and vertex buffer objects.
Only glDrawArrays() done so far.
Simplified glVertex/Color/etcPointer functions.
Misc casts added here and there.
2003-10-22 22:59:07 +00:00
Kendall Bennett
15c37348a5 More SciTech SNAP updates. Some of these files didn't really change, but
they show up in the list (GLU stuff) for some reason. The major change
here is the addition of code in the glx86asm.py file to generate assembler
stub entry points with the correct name decorations for _stdcall calling
conventions so this can be used on Windows boxes.
2003-10-22 21:02:15 +00:00
Daniel Borca
23f45833aa cosmetics and memos 2003-10-22 11:34:22 +00:00
Daniel Borca
e87d106d66 small fixes to accomodate Intel compiler/linker 2003-10-22 11:33:14 +00:00
Daniel Borca
758cbc68de fixed a typo (array size) 2003-10-22 11:30:37 +00:00
Kendall Bennett
c329e5a3d8 Updates to SSE assembler support for Open Watcom 2003-10-21 23:53:34 +00:00
Kendall Bennett
c40d1dd62d Added GLAPIENTRY decorations for all first level OpenGL API function entry
points so that the calling conventions will work correctly with the assembler
stubs with the Open Watcom compiler.
2003-10-21 22:22:17 +00:00
Alan Hourihane
b1ca87a565 prevent from optimizing out by some compilers (from XFree86 CVS) 2003-10-21 21:49:23 +00:00
Brian Paul
35b52c72d0 added more debug code and tests 2003-10-21 14:56:53 +00:00
Brian Paul
b4590f1c94 wrap in #ifdef FX / #endif 2003-10-21 14:55:27 +00:00
Brian Paul
ce8e13dc79 fix an error message 2003-10-21 14:54:16 +00:00
Daniel Borca
1b6cca67b5 documentation update; also new makefiles for Win32 MesaFX build 2003-10-21 11:15:52 +00:00
Jouk Jansen
1d61db5f31 Committing in .
The latest version of the OpenVMS DECCRTL contains (v)snprintf
 If this one is beeing used the (v)snprintf routines are not compiled in
 from mesa's source.

 Modified Files:
 	Mesa-newtree/src/mesa/main/descrip.mms
 	Mesa-newtree/src/mesa/main/imports.c
 ----------------------------------------------------------------------
2003-10-21 10:12:47 +00:00
Daniel Borca
6d4afe2a95 fixed some NASM opcodes; added segment overrides and temporary labels 2003-10-21 08:33:10 +00:00
Daniel Borca
f03cb2e4ee Napalm total immersion 2003-10-21 08:31:02 +00:00
Daniel Borca
3f60e4f21b cosmetics; translated asm routines for use with ASSYNTAX.H 2003-10-21 08:27:21 +00:00
Jon Smirl
1aa28b3fe3 Clean out some unused files 2003-10-21 06:26:05 +00:00
Jon Smirl
bcc6eddd33 Update DRI drivers to current DRI CVS and make them work. 2003-10-21 06:05:39 +00:00
Karl Schultz
906449753f Define GLAPIENTRYP properly so that GLU compiles on Windows. 2003-10-20 17:36:41 +00:00
Karl Schultz
ec7eb274ab Fix error in last check-in. 2003-10-20 16:48:14 +00:00
Karl Schultz
3aaeec6a01 Add missing files for building Windows distribution. 2003-10-20 16:28:00 +00:00
Jon Smirl
3e4a50f0d2 Fix Makefiles to copy lib to $(TOP)/lib if missing 2003-10-20 02:17:32 +00:00
Brian Paul
0f85b91c8a Move initialization of default ctx->Driver.buffer-object-functions into
bufferobj.c so all the drivers don't have to worry about them.
2003-10-19 15:10:36 +00:00
Brian Paul
2bd4b68c5e fix CVS info 2003-10-17 14:09:54 +00:00
Brian Paul
7c276acb6f add .dsp files to tarballs 2003-10-16 19:30:22 +00:00
Brian Paul
5cd54509f5 update list of files for tarballs 2003-10-16 19:25:24 +00:00
Brian Paul
e8db87ee88 obsolete 2003-10-16 16:33:51 +00:00
Brian Paul
3eb0edb31f added GL_ARB_point_sprite tokens 2003-10-16 16:33:05 +00:00
Jon Smirl
93dc6942eb Define SOLO so that check is possible for SOLO in project makefiles 2003-10-16 04:54:24 +00:00
Jon Smirl
3fc0db95e4 Minor changes to make linux-solo build again 2003-10-16 04:50:42 +00:00
Brian Paul
f62b8985d6 protect whole file with #ifdef FX 2003-10-15 21:13:15 +00:00
Brian Paul
4eaf56a160 fix minor warnings from g++ 3.2 2003-10-15 21:11:13 +00:00
Brian Paul
16927d02bc initialize GetBufferSubData pointer 2003-10-15 20:51:28 +00:00
Brian Paul
49aefce5e5 minor tweaks 2003-10-15 20:50:41 +00:00
Kendall Bennett
596d57c42a Updates to SGI GLU code to get it to compile clean with the Open Watcom compiler.
Most of the changes were to get rid of warnings, but many of the warnings could
not be removed in the code so I also added #pragma's to disable the warnings.
Someone really should clean up this code, but I didn't want to mess with it
that much (and potentially break it).
2003-10-14 23:48:57 +00:00
Kendall Bennett
9b77fb7dab Updates to x86 assembler support for Open Watcom and SNAP 2003-10-14 23:47:21 +00:00
Brian Paul
0f22705b0b remove some cruft 2003-10-14 16:59:44 +00:00
Brian Paul
4524274377 exercise more vertex buffer object functions 2003-10-14 15:49:12 +00:00
Brian Paul
0bb281ba21 bufObj->Access wasn't being set 2003-10-14 15:48:39 +00:00
Daniel Borca
0219d1168e minor fixes + doc update 2003-10-14 14:56:45 +00:00
Brian Paul
4b6f6e1b3d minor fix in buffer_object_get_target() 2003-10-14 14:49:39 +00:00
Daniel Borca
fd83bc2b33 glide driver (wip) 2003-10-13 11:14:58 +00:00
Daniel Borca
6c520ef3d3 GameMode 2003-10-13 11:05:36 +00:00
Brian Paul
e4db8eb6fa added GL_ARB_point_sprite demo, texgen bug fix 2003-10-11 16:42:15 +00:00
Brian Paul
2655e68504 fix some sphere texgen bugs (reported by Daniel Borca) 2003-10-11 16:34:32 +00:00
Brian Paul
4128d88b98 s/GL_COLOR_INDEX/OSMESA_COLOR_INDEX/ 2003-10-11 15:41:34 +00:00
Brian Paul
5dce1e5c42 don't request accum buffer in color index mode 2003-10-11 15:39:11 +00:00
Brian Paul
dd29e04bd6 don't use color table's format to determine texture env functions 2003-10-11 15:30:14 +00:00
Karl Schultz
ad5cd6d337 Add missing entry points. (Warren Cashen) 2003-10-10 22:09:05 +00:00
Brian Paul
e6804945b3 add switch defaults to silence warnings 2003-10-10 18:11:17 +00:00
Brian Paul
db40aec48c remove bogus _swrast_texture_table_lookup() call (Eric Plante) 2003-10-10 18:10:54 +00:00
Brian Paul
78f8292a54 old/unused 2003-10-10 18:00:57 +00:00
Brian Paul
1c4b7116c4 Eric Plante's updates for OSMesa16. 2003-10-10 17:58:38 +00:00
Karl Schultz
faa2b09012 Add notes about building with the mangled namespace on Windows. 2003-10-10 17:13:47 +00:00
Kendall Bennett
d4155bd1df Added missing #undef SPAN_VARS to swrast/s_spantemp.h 2003-10-09 22:39:07 +00:00
Daniel Borca
009d7f8ba1 Minor MinGW fixes 2003-10-09 15:15:07 +00:00
Daniel Borca
1ffdad4939 FEATURE_ARB_vertex_buffer_object 2003-10-09 15:13:30 +00:00
Daniel Borca
d9f1e453ea Reorganized combiners. Added optimized span functions. 2003-10-09 15:12:20 +00:00
Keith Whitwell
bcb3957b6c Eric's mesa-depth32.diff 2003-10-09 11:33:38 +00:00
1450 changed files with 288342 additions and 97247 deletions

File diff suppressed because it is too large Load Diff

383
Makefile Normal file
View File

@@ -0,0 +1,383 @@
# Top-level Mesa makefile
TOP = .
SUBDIRS = src progs
default: $(TOP)/configs/current
@for dir in $(SUBDIRS) ; do \
(cd $$dir ; $(MAKE)) || exit 1 ; \
done
doxygen:
(cd doxygen ; make) ; \
clean:
@for dir in $(SUBDIRS) ; do \
(cd $$dir ; $(MAKE) clean) ; \
done
realclean:
touch $(TOP)/configs/current
$(MAKE) clean
-rm -rf lib*
-rm -f $(TOP)/configs/current
-rm -f `find . -name \*.o`
-rm -f `find . -name \*.a`
-rm -f `find . -name \*.so`
install:
@echo "Installing"
$(TOP)/bin/installmesa
# If there's no current configuration file
$(TOP)/configs/current:
@echo
@echo
@echo "Please choose a configuration from the following list:"
@ls -1 $(TOP)/configs | grep -v "current\|default\|CVS"
@echo
@echo "Then type 'make <config>' (ex: 'make linux-x86')"
@echo "(ignore the following error message)"
@exit 1
# Rules to set/install a specific build configuration
aix \
aix-64 \
aix-gcc \
aix-static \
beos \
darwin \
darwin-static \
freebsd \
freebsd-dri \
freebsd-dri-x86 \
hpux10 \
hpux10-gcc \
hpux10-static \
hpux11-32 \
hpux11-32-static \
hpux11-32-static-nothreads \
hpux11-64 \
hpux11-64-static \
hpux9 \
hpux9-gcc \
irix6-64 \
irix6-64-static \
irix6-n32 \
irix6-n32-static \
irix6-o32 \
irix6-o32-static \
linux \
linux-alpha \
linux-alpha-static \
linux-debug \
linux-dri \
linux-dri-x86 \
linux-dri-x86-64 \
linux-dri-ppc \
linux-glide \
linux-icc \
linux-icc-static \
linux-osmesa16 \
linux-osmesa16-static \
linux-osmesa32 \
linux-ppc \
linux-ppc-static \
linux-solo \
linux-solo-x86 \
linux-solo-ia64 \
linux-sparc \
linux-sparc5 \
linux-static \
linux-ultrasparc \
linux-tcc \
linux-x86 \
linux-x86-debug \
linux-x86-64 \
linux-x86-64-static \
linux-x86-glide \
linux-x86-static \
netbsd \
openbsd \
osf1 \
solaris-x86 \
solaris-x86-gcc \
sunos4 \
sunos4-gcc \
sunos4-static \
sunos5 \
sunos5-gcc \
sunos5-smp \
ultrix-gcc:
(cd configs && rm -f current && ln -s $@ current)
$(MAKE) default
# Rules for making release tarballs
DIRECTORY = Mesa-6.2
LIB_NAME = MesaLib-6.2
DEMO_NAME = MesaDemos-6.2
LIB_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/descrip.mms \
$(DIRECTORY)/mms-config. \
$(DIRECTORY)/Mesa.dsw \
$(DIRECTORY)/bin/mklib \
$(DIRECTORY)/bin/installmesa \
$(DIRECTORY)/configs/[a-z]* \
$(DIRECTORY)/docs/*.html \
$(DIRECTORY)/docs/COPYING \
$(DIRECTORY)/docs/INSTALL.GNU \
$(DIRECTORY)/docs/README.* \
$(DIRECTORY)/docs/RELNOTES* \
$(DIRECTORY)/docs/VERSIONS \
$(DIRECTORY)/docs/*.spec \
$(DIRECTORY)/include/GL/internal/glcore.h \
$(DIRECTORY)/include/GL/dmesa.h \
$(DIRECTORY)/include/GL/amesa.h \
$(DIRECTORY)/include/GL/fxmesa.h \
$(DIRECTORY)/include/GL/ggimesa.h \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/include/GL/glx.h \
$(DIRECTORY)/include/GL/glxext.h \
$(DIRECTORY)/include/GL/glx_mangle.h \
$(DIRECTORY)/include/GL/mesa_wgl.h \
$(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)/src/Makefile \
$(DIRECTORY)/src/descrip.mms \
$(DIRECTORY)/src/mesa/Makefile* \
$(DIRECTORY)/src/mesa/sources \
$(DIRECTORY)/src/mesa/descrip.mms \
$(DIRECTORY)/src/mesa/depend \
$(DIRECTORY)/src/mesa/main/*.[chS] \
$(DIRECTORY)/src/mesa/main/main.dsp \
$(DIRECTORY)/src/mesa/main/descrip.mms \
$(DIRECTORY)/src/mesa/glapi/*.[chS] \
$(DIRECTORY)/src/mesa/glapi/glapi.dsp \
$(DIRECTORY)/src/mesa/glapi/descrip.mms \
$(DIRECTORY)/src/mesa/array_cache/*.[ch] \
$(DIRECTORY)/src/mesa/array_cache/array_cache.dsp \
$(DIRECTORY)/src/mesa/array_cache/descrip.mms \
$(DIRECTORY)/src/mesa/math/*.[ch] \
$(DIRECTORY)/src/mesa/math/math.dsp \
$(DIRECTORY)/src/mesa/math/descrip.mms \
$(DIRECTORY)/src/mesa/shader/*.[ch] \
$(DIRECTORY)/src/mesa/shader/shader.dsp \
$(DIRECTORY)/src/mesa/shader/descrip.mms \
$(DIRECTORY)/src/mesa/swrast/*.[ch] \
$(DIRECTORY)/src/mesa/swrast/swrast.dsp \
$(DIRECTORY)/src/mesa/swrast/descrip.mms \
$(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \
$(DIRECTORY)/src/mesa/swrast_setup/swrast_setup.dsp \
$(DIRECTORY)/src/mesa/swrast_setup/descrip.mms \
$(DIRECTORY)/src/mesa/tnl/*.[chS] \
$(DIRECTORY)/src/mesa/tnl/tnl.dsp \
$(DIRECTORY)/src/mesa/tnl/descrip.mms \
$(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm \
$(DIRECTORY)/src/mesa/drivers/beos/*.cpp \
$(DIRECTORY)/src/mesa/drivers/beos/Makefile \
$(DIRECTORY)/src/mesa/drivers/common/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/common/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/dos/*.[chS] \
$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/fbdev/glfbdev.c \
$(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/glide/*.def \
$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c \
$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c \
$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h \
$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \
$(DIRECTORY)/src/mesa/drivers/osmesa/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \
$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.dsp \
$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.def \
$(DIRECTORY)/src/mesa/drivers/windows/*/*.dsp \
$(DIRECTORY)/src/mesa/drivers/x11/descrip.mms \
$(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \
$(DIRECTORY)/src/mesa/sparc/*.[chS] \
$(DIRECTORY)/src/mesa/x86/Makefile \
$(DIRECTORY)/src/mesa/x86/*.[ch] \
$(DIRECTORY)/src/mesa/x86/*.S \
$(DIRECTORY)/src/glu/Makefile \
$(DIRECTORY)/src/glu/descrip.mms \
$(DIRECTORY)/src/glu/sgi/Makefile \
$(DIRECTORY)/src/glu/sgi/Makefile.win \
$(DIRECTORY)/src/glu/sgi/Makefile.DJ \
$(DIRECTORY)/src/glu/sgi/cc*.txt \
$(DIRECTORY)/src/glu/sgi/glu.def \
$(DIRECTORY)/src/glu/sgi/glu.dsp \
$(DIRECTORY)/src/glu/sgi/dummy.cc \
$(DIRECTORY)/src/glu/sgi/descrip.mms \
$(DIRECTORY)/src/glu/sgi/mesaglu.opt \
$(DIRECTORY)/src/glu/sgi/include/gluos.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc \
$(DIRECTORY)/src/glu/sgi/libtess/README \
$(DIRECTORY)/src/glu/sgi/libtess/alg-outline \
$(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \
$(DIRECTORY)/src/glu/sgi/libutil/*.[ch] \
$(DIRECTORY)/src/glu/mesa/README[12] \
$(DIRECTORY)/src/glu/mesa/Makefile* \
$(DIRECTORY)/src/glu/mesa/descrip.mms \
$(DIRECTORY)/src/glu/mesa/mms_depend \
$(DIRECTORY)/src/glu/mesa/*.def \
$(DIRECTORY)/src/glu/mesa/depend \
$(DIRECTORY)/src/glu/mesa/*.[ch] \
$(DIRECTORY)/src/glw/*.[ch] \
$(DIRECTORY)/src/glw/Makefile* \
$(DIRECTORY)/src/glw/README \
$(DIRECTORY)/src/glw/depend \
$(DIRECTORY)/progs/Makefile \
$(DIRECTORY)/progs/util/README \
$(DIRECTORY)/progs/util/*.[ch] \
$(DIRECTORY)/progs/util/sampleMakefile \
$(DIRECTORY)/vms/analyze_map.com \
$(DIRECTORY)/vms/xlib.opt \
$(DIRECTORY)/vms/xlib_share.opt
DEMO_FILES = \
$(DIRECTORY)/include/GL/glut.h \
$(DIRECTORY)/include/GL/glutf90.h \
$(DIRECTORY)/src/glut/glx/Makefile* \
$(DIRECTORY)/src/glut/glx/depend \
$(DIRECTORY)/src/glut/glx/*def \
$(DIRECTORY)/src/glut/glx/descrip.mms \
$(DIRECTORY)/src/glut/glx/mms_depend \
$(DIRECTORY)/src/glut/glx/glut.dsp \
$(DIRECTORY)/src/glut/glx/*.[ch] \
$(DIRECTORY)/src/glut/beos/*.[ch] \
$(DIRECTORY)/src/glut/beos/*.cpp \
$(DIRECTORY)/src/glut/beos/Makefile \
$(DIRECTORY)/src/glut/dos/*.[ch] \
$(DIRECTORY)/src/glut/dos/Makefile.DJ \
$(DIRECTORY)/src/glut/dos/PC_HW/*.[chS] \
$(DIRECTORY)/src/glut/ggi/*.[ch] \
$(DIRECTORY)/src/glut/ggi/Makefile \
$(DIRECTORY)/progs/beos/*.cpp \
$(DIRECTORY)/progs/beos/Makefile \
$(DIRECTORY)/progs/images/*.rgb \
$(DIRECTORY)/progs/images/*.rgba \
$(DIRECTORY)/progs/demos/Makefile* \
$(DIRECTORY)/progs/demos/descrip.mms \
$(DIRECTORY)/progs/demos/*.[ch] \
$(DIRECTORY)/progs/demos/*.cxx \
$(DIRECTORY)/progs/demos/*.dat \
$(DIRECTORY)/progs/demos/README \
$(DIRECTORY)/progs/demos/Windows/*.dsp \
$(DIRECTORY)/progs/demos/Windows/*.dsw \
$(DIRECTORY)/progs/xdemos/Makefile* \
$(DIRECTORY)/progs/xdemos/descrip.mms \
$(DIRECTORY)/progs/xdemos/*.[chf] \
$(DIRECTORY)/progs/redbook/Makefile* \
$(DIRECTORY)/progs/redbook/README \
$(DIRECTORY)/progs/redbook/*.[ch] \
$(DIRECTORY)/progs/samples/Makefile* \
$(DIRECTORY)/progs/samples/README \
$(DIRECTORY)/progs/samples/*.c \
$(DIRECTORY)/progs/windml/Makefile.ugl \
$(DIRECTORY)/progs/windml/*.c \
$(DIRECTORY)/progs/windml/*.bmp \
$(DIRECTORY)/progs/ggi/*.c
DRI_FILES = \
$(DIRECTORY)/src/glx/Makefile \
$(DIRECTORY)/src/glx/mini/*.[ch] \
$(DIRECTORY)/src/glx/mini/example.miniglx.conf \
$(DIRECTORY)/src/glx/mini/NOTES \
$(DIRECTORY)/src/mesa/drivers/dri/Makefile \
$(DIRECTORY)/src/mesa/drivers/dri/Makefile.template \
$(DIRECTORY)/src/mesa/drivers/dri/common/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/dri/dri_client/imports/*.h \
$(DIRECTORY)/src/mesa/drivers/dri/*/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/dri/*/depend \
$(DIRECTORY)/src/mesa/drivers/dri/*/Makefile \
$(DIRECTORY)/src/mesa/drivers/dri/*/Doxyfile \
$(DIRECTORY)/src/mesa/drivers/dri/*/server/*.[ch]
# Everything for new a Mesa release:
tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
lib_gz:
rm -f configs/current ; \
cd .. ; \
tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
gzip $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.gz $(DIRECTORY)
demo_gz:
cd .. ; \
tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
gzip $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.gz $(DIRECTORY)
lib_bz2:
rm -f configs/current ; \
cd .. ; \
tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
bzip2 $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
demo_bz2:
cd .. ; \
tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
bzip2 $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
lib_zip:
rm -f configs/current ; \
-rm $(LIB_NAME).zip ; \
cd .. ; \
zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
mv $(LIB_NAME).zip $(DIRECTORY)
demo_zip:
-rm $(DEMO_NAME).zip ; \
cd .. ; \
zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
mv $(DEMO_NAME).zip $(DIRECTORY)
md5:
@-md5sum $(LIB_NAME).tar.gz
@-md5sum $(LIB_NAME).tar.bz2
@-md5sum $(LIB_NAME).zip
@-md5sum $(DEMO_NAME).tar.gz
@-md5sum $(DEMO_NAME).tar.bz2
@-md5sum $(DEMO_NAME).zip

View File

@@ -20,9 +20,9 @@
# 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.
# DOS/DJGPP makefile v1.4 for Mesa
# DOS/DJGPP makefile v1.6 for Mesa
#
# Copyright (C) 2002 - Borca Daniel
# Copyright (C) 2002 - Daniel Borca
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
@@ -43,18 +43,7 @@
# As a consequence, you'll need the DJGPP Glide3
# library to build any application.
# default = no
# MATROX=1 build for Matrox Millennium I (MGA2064W) cards.
# This is experimental and not intensively tested.
# default = no
# HAVE_X86=1 optimize for i386.
# default = no
# HAVE_MMX=1 allow MMX specializations, provided your assembler
# supports MMX instruction set. However, the true CPU
# capabilities are checked at run-time to avoid crashes.
# default = no
# HAVE_SSE=1 (see HAVE_MMX)
# default = no
# HAVE_3DNOW=1 (see HAVE_MMX)
# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
# default = no
#
# Targets:
@@ -75,7 +64,7 @@ CPU ?= pentium
GLU ?= mesa
CFLAGS = -Wall -W -pedantic
CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
CFLAGS += -O2 -ffast-math -mtune=$(CPU)
export CFLAGS

View File

@@ -1,671 +0,0 @@
# $Id: Makefile.X11,v 1.90 2003/10/03 14:03:14 brianp Exp $
# Mesa 3-D graphics library
# Version: 5.1
#
# Copyright (C) 1999-2003 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.
# Top-level makefile for Mesa
# To add a new configuration for your system add it to the list below
# then update the Make-config file.
SHELL = /bin/sh
default:
@echo "Type one of the following:"
@echo " make aix for IBM RS/6000 with AIX"
@echo " make aix-sl for IBM RS/6000, make shared libs"
@echo " make beos-r4 for BeOS R4"
@echo " make cygnus for Win95/NT using Cygnus-Win32"
@echo " make cygnus-linux for Win95/NT using Cygnus-Win32 under Linux"
@echo " make darwin for Darwin - Mac OS X"
@echo " make freebsd for FreeBSD systems with GCC"
@echo " make freebsd-386 for FreeBSD systems with GCC, w/ Intel assembly"
@echo " make gcc-sl for a generic system with GCC for shared libs"
@echo " make hpux9 for HP systems with HPUX 9.x"
@echo " make hpux9-sl for HP systems with HPUX 9.x, make shared libs"
@echo " make hpux9-gcc for HP systems with HPUX 9.x using GCC"
@echo " make hpux9-gcc-sl for HP systems with HPUX 9.x, GCC, make shared libs"
@echo " make hpux10 for HP systems with HPUX 10.x and 11.x"
@echo " make hpux10-sl for HP systems with HPUX 10.x and 11.x, shared libs"
@echo " make hpux10-gcc for HP systems with HPUX 10.x w/ GCC"
@echo " make hpux10-gcc-sl for HP systems with HPUX 10.x w/ GCC, shared libs"
@echo " make irix6-o32 for SGI systems with IRIX 6.x, make o32-bit libs"
@echo " make irix6-o32-dso for SGI systems with IRIX 6.x, make o32-bit DSOs"
@echo " make irix6-n32 for SGI systems with IRIX 6.x, make n32-bit libs"
@echo " make irix6-n32-dso for SGI systems with IRIX 6.x, make n32-bit DSOs"
@echo " make irix6-gcc-n32-sl for SGI systems with IRIX 6.x, GCC, make n32 DSOs"
@echo " make irix6-64 for SGI systems with IRIX 6.x, make 64-bit libs"
@echo " make irix6-64-dso for SGI systems with IRIX 6.x, make 64-bit DSOs"
@echo " make linux for Linux"
@echo " make linux-x86 for Linux with x86 optimizations"
@echo " make linux-ggi for Linux with libggi driver"
@echo " make linux-x86-ggi for Linux with libggi driver and x86 optimizations"
@echo " make linux-glide for Linux with 3Dfx Glide driver"
@echo " make linux-x86-glide for Linux with 3Dfx Glide driver and x86 opts"
@echo " make linux-alpha for Linux with Alpha optimizations"
@echo " make linux-alpha-static for Linux with Alpha opts, make static libs"
@echo " make linux-ppc for Linux with PowerPC opts"
@echo " make linux-ppc-static for Linux with PowerPC opts, make static libs"
@echo " make linux-sparc for Linux with Sparc optimzations"
@echo " make linux-sparc5 for Linux with Sparc5 optimizations"
@echo " make linux-sparc-ultra for Linux with UltraSparc optimizations"
@echo " make linux-osmesa16 for 16-bit/channel OSMesa"
@echo " make linux-osmesa32 for 32-bit/channel OSMesa"
@echo " make linux-solo for Linux standalone with dri drivers"
@echo " make linux-icc for Linux with the Intel C/C++ compiler"
@echo " make lynxos for LynxOS systems with GCC"
@echo " make mklinux for Linux on Power Macintosh"
@echo " make netbsd for NetBSD 1.0 systems with GCC"
@echo " make openbsd for OpenBSD systems"
@echo " make openstep for OpenStep/MacOSX Server systems"
@echo " make osf1 for DEC Alpha systems with OSF/1"
@echo " make qnx for QNX V4 systems with Watcom compiler"
@echo " make solaris-x86 for PCs with Solaris"
@echo " make solaris-x86-gcc for PCs with Solaris using GCC"
@echo " make sunos4 for Suns with SunOS 4.x"
@echo " make sunos4-sl for Suns with SunOS 4.x, make shared libs"
@echo " make sunos4-gcc for Suns with SunOS 4.x and GCC"
@echo " make sunos4-gcc-sl for Suns with SunOS 4.x, GCC, make shared libs"
@echo " make sunos5 for Suns with SunOS 5.x"
@echo " make sunos5-smp for Suns with SunOS 5.x, SMP optimization"
@echo " make sunos5-gcc for Suns with SunOS 5.x and GCC"
@echo " make ultrix-gcc for DEC systems with Ultrix and GCC"
@echo " make unixware for PCs running UnixWare"
@echo " make unixware-shared for PCs running UnixWare, shared libs"
@echo " make clean remove .o files"
@echo " make realclean remove .o, library and executable files"
# XXX we may have to split up this group of targets into those that
# have a C++ compiler and those that don't for the SI-GLU library.
aix aix-sl darwin freebsd freebsd-386 gcc-sl \
hpux9 hpux9-sl hpux9-gcc hpux9-gcc-sl \
hpux10 hpux10-sl hpux10-gcc hpux10-gcc-sl \
linux linux-debug \
linux-x86 linux-x86-sse linux-icc linux-x86-static linux-x86-debug \
linux-glide linux-x86-glide linux-glide-debug \
linux-alpha-static linux-alpha \
linux-ppc-static linux-ppc \
linux-sparc linux-sparc5 linux-sparc-ultra \
mklinux netbsd osf1 openbsd qnx \
solaris-x86 solaris-x86-gcc \
sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
sunos5 sunos5-smp sunos5-gcc \
ultrix-gcc unixware:
-mkdir lib
if [ -d src/mesa ] ; then touch src/mesa/depend ; fi
if [ -d src/glu/sgi ] ; then touch src/glu/sgi/depend ; fi
if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
if [ -d src/glw ] ; then touch src/glw/depend ; fi
if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glw ] ; then cd src/glw ; $(MAKE) -f Makefile.X11 $@ ; fi
gcc-mesa-sl:
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
irix6-o32 irix6-o32-dso irix6-n32 irix6-n32-dso irix6-gcc-n32-sl:
-mkdir lib32
if [ -d src/mesa ] ; then touch src/mesa/depend ; fi
if [ -d src/glu/sgi ] ; then touch src/glu/sgi/depend ; fi
if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
if [ -d src/glw ] ; then touch src/glw/depend ; fi
if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
irix6-64 irix6-64-dso:
-mkdir lib64
if [ -d src/mesa ] ; then touch src/mesa/depend ; fi
if [ -d src/glu/sgi ] ; then touch src/glu/sgi/depend ; fi
if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
if [ -d src/glw ] ; then touch src/glw/depend ; fi
if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
beos-r4:
-mkdir lib
-rm src/mesa/depend
touch src/mesa/depend
-rm src/glu/sgi/depend
touch src/glu/sgi/depend
if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d src/glut/beos ] ; then cd src/glut/beos ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d src/glut/beos ] ; then cp src/glut/beos/obj*/libglut.so lib ; fi
if [ -d progs/beos ] ; then cd progs/beos ; $(MAKE) ; fi
if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.BeOS-R4 $@ ; fi
cygnus cygnus-linux:
-mkdir lib
touch src/depend
touch src-glu/depend
if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glw ] ; then cd src/glw ; $(MAKE) -f Makefile.X11 $@ ; fi
openstep:
-mkdir lib
cd src/mesa ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
cd src/glu/sgi ; $(MAKE) -f Makefile.X11 "MYCC=${CC}" $@
linux-ggi linux-x86-ggi:
-mkdir lib
touch src/depend
touch src/glu/sgi/depend
if [ -d src/glut/glx ] ; then touch src/glut/glx/depend ; fi
if [ -d src/glw ] ; then touch src/glw/depend ; fi
if [ -d src/mesa ] ; then cd src ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glu/sgi ] ; then cd src/glu/sgi ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glut/glx ] ; then cd src/glut/glx ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d ggi/demos ] ; then cd ggi/demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glw ] ; then cd src/glw; $(MAKE) -f Makefile.X11 $@ ; fi
# if you change GGI_DEST please change it in ggimesa.conf, too.
DESTDIR=/usr/local
GGI_DEST=lib/ggi/mesa
linux-ggi-install linux-x86-ggi-install:
install -d $(DESTDIR)/$(GGI_DEST)/default $(DESTDIR)/$(GGI_DEST)/display $(DESTDIR)/etc/ggi
install -m 0755 src/GGI/default/*.so $(DESTDIR)/$(GGI_DEST)/default
install -m 0755 src/GGI/display/*.so $(DESTDIR)/$(GGI_DEST)/display
install -m 0644 src/GGI/ggimesa.conf $(DESTDIR)/etc/ggi
# if [ -z "`grep ggimesa $(DESTDIR)/etc/ggi/libggi.conf`" ]; then \
# echo ".include $(DESTDIR)/etc/ggi/ggimesa.conf" >> $(DESTDIR)/etc/ggi/libggi.conf ; \
# fi
linux-osmesa16 linux-osmesa32:
-mkdir lib
if [ -d src ] ; then touch src/depend ; fi
if [ -d src ] ; then cd src ; $(MAKE) -f Makefile.OSMesa16 $@ ; fi
linux-solo:
-mkdir lib
if [ -d src/mesa ] ; then touch src/mesa/depend ; fi
if [ -d src/glx/mini ] ; then touch src/glx/mini/depend ; fi
if [ -d src/glu/mini ] ; then touch src/glu/mini/depend ; fi
if [ -d src/glut/mini ] ; then touch src/glut/mini/depend ; fi
if [ -d src/mesa/drivers/dri/r200 ] ; then touch src/mesa/drivers/dri/r200/depend ; fi
if [ -d src/mesa/drivers/dri/r128 ] ; then touch src/mesa/drivers/dri/r128/depend ; fi
if [ -d src/mesa/drivers/dri/radeon ] ; then touch src/mesa/drivers/dri/radeon/depend ; fi
if [ -d src/mesa/drivers/dri/mga ] ; then touch src/mesa/drivers/dri/mga/depend ; fi
if [ -d src/mesa/drivers/dri/i810 ] ; then touch src/mesa/drivers/dri/i810/depend ; fi
if [ -d src/mesa/drivers/dri/i830 ] ; then touch src/mesa/drivers/dri/i830/depend ; fi
if [ -d src/mesa/drivers/dri/sis ] ; then touch src/mesa/drivers/dri/sis/depend ; fi
if [ -d src/mesa/drivers/dri/gamma ] ; then touch src/mesa/drivers/dri/gamma/depend ; fi
if [ -d src/mesa/drivers/dri/fb ] ; then touch src/mesa/drivers/dri/fb/depend ; fi
if [ -d src/glut/mini ] ; then touch src/glut/mini/depend ; fi
if [ -d progs/miniglx ] ; then touch progs/miniglx/depend ; fi
if [ -d progs/tests ] ; then touch progs/tests/depend ; fi
if [ -d src/mesa ] ; then cd src/mesa ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/r200 ] ; then cd src/mesa/drivers/dri/r200 ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/r128 ] ; then cd src/mesa/drivers/dri/r128 ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/radeon ] ; then cd src/mesa/drivers/dri/radeon ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/mga ] ; then cd src/mesa/drivers/dri/mga ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/i810 ] ; then cd src/mesa/drivers/dri/i810 ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/i830 ] ; then cd src/mesa/drivers/dri/i830 ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/sis ] ; then cd src/mesa/drivers/dri/sis ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/gamma ] ; then cd src/mesa/drivers/dri/gamma ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/mesa/drivers/dri/fb ] ; then cd src/mesa/drivers/dri/fb ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glx/mini ] ; then cd src/glx/mini ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glu/mini ] ; then cd src/glu/mini ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d src/glut/mini ] ; then cd src/glut/mini ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/miniglx ] ; then cd progs/miniglx ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/tests ] ; then cd progs/tests ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/demos ] ; then cd progs/demos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/xdemos ] ; then cd progs/xdemos ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/samples ] ; then cd progs/samples ; $(MAKE) -f Makefile.X11 $@ ; fi
if [ -d progs/redbook ] ; then cd progs/redbook ; $(MAKE) -f Makefile.X11 $@ ; fi
# Remove .o files, emacs backup files, etc.
clean:
if ! [ -f src/mesa/depend ] ; then touch src/mesa/depend ; fi
if ! [ -f src/mesa/drivers/dri/r200/depend ]; then touch src/mesa/drivers/dri/r200/depend; fi
if ! [ -f src/mesa/drivers/dri/r128/depend ]; then touch src/mesa/drivers/dri/r128/depend; fi
if ! [ -f src/mesa/drivers/dri/radeon/depend ]; then touch src/mesa/drivers/dri/radeon/depend; fi
if ! [ -f src/mesa/drivers/dri/mga/depend ]; then touch src/mesa/drivers/dri/mga/depend; fi
if ! [ -f src/mesa/drivers/dri/fb/depend ]; then touch src/mesa/drivers/dri/fb/depend; fi
if ! [ -f src/glu/mesa/depend ] ; then touch src/glu/mesa/depend ; fi
if ! [ -f src/glu/sgi/depend ] ; then touch src/glu/sgi/depend ; fi
if ! [ -f src/glu/mini/depend ] ; then touch src/glu/mini/depend ; fi
if ! [ -f src/glut/glx/depend ] ; then touch src/glut/glx/depend ; fi
if ! [ -f src/glut/mini/depend ] ; then touch src/glut/mini/depend ; fi
if ! [ -f src/glx/mini/depend ] ; then touch src/glx/mini/depend ; fi
if ! [ -f progs/tests/depend ] ; then touch progs/tests/depend ; fi
if ! [ -f progs/miniglx/depend ] ; then touch progs/miniglx/depend ; fi
-rm -f include/GL/*~
cd src/mesa && $(MAKE) -f Makefile.X11 $@ || true
cd src/mesa/drivers/dri/r200 && $(MAKE) -f Makefile.X11 $@ || true
cd src/mesa/drivers/dri/r128 && $(MAKE) -f Makefile.X11 $@ || true
cd src/mesa/drivers/dri/radeon && $(MAKE) -f Makefile.X11 $@ || true
cd src/mesa/drivers/dri/mga && $(MAKE) -f Makefile.X11 $@ || true
cd src/mesa/drivers/dri/fb && $(MAKE) -f Makefile.X11 $@ || true
cd src/glu/mesa && $(MAKE) -f Makefile.X11 $@ || true
cd src/glu/sgi && $(MAKE) -f Makefile.X11 $@ || true
cd src/glu/mini && $(MAKE) -f Makefile.X11 $@ || true
cd src/glut/glx && $(MAKE) -f Makefile.X11 $@ || true
cd src/glut/mini && $(MAKE) -f Makefile.X11 $@ || true
cd src/glw && $(MAKE) -f Makefile.X11 $@ || true
cd src/glx/mini && $(MAKE) -f Makefile.X11 $@ || true
cd progs/demos && $(MAKE) -f Makefile.X11 $@ || true
cd progs/redbook && $(MAKE) -f Makefile.X11 $@ || true
cd progs/xdemos && $(MAKE) -f Makefile.X11 $@ || true
cd progs/samples && $(MAKE) -f Makefile.X11 $@ || true
cd progs/tests && $(MAKE) -f Makefile.X11 $@ || true
cd progs/miniglx && $(MAKE) -f Makefile.X11 $@ || true
if [ -f src/mesa/depend ] ; then rm src/mesa/depend ; fi
if [ -f src/mesa/drivers/dri/r200/depend ]; then rm -f src/mesa/drivers/dri/r200/depend; fi
if [ -f src/mesa/drivers/dri/r128/depend ]; then rm -f src/mesa/drivers/dri/r128/depend; fi
if [ -f src/mesa/drivers/dri/radeon/depend ]; then rm -f src/mesa/drivers/dri/radeon/depend; fi
if [ -f src/mesa/drivers/dri/mga/depend ]; then rm -f src/mesa/drivers/dri/mga/depend; fi
if [ -f src/mesa/drivers/dri/fb/depend ]; then rm -f src/mesa/drivers/dri/fb/depend; fi
if [ -f src/glu/mesa/depend ] ; then rm -f src/glu/mesa/depend ; fi
if [ -f src/glu/sgi/depend ] ; then rm -f src/glu/sgi/depend ; fi
if [ -f src/glu/mini/depend ] ; then rm -f src/glu/mini/depend ; fi
if [ -f src/glut/glx/depend ] ; then rm -f src/glut/glx/depend ; fi
if [ -f src/glut/mini/depend ] ; then rm -f src/glut/mini/depend ; fi
if [ -f src/glx/mini/depend ] ; then rm -f src/glx/mini/depend ; fi
if [ -f progs/tests/depend ] ; then rm -f progs/tests/depend ; fi
if [ -f progs/miniglx/depend ] ; then rm -f progs/miniglx/depend ; fi
# Remove everything that can be remade
realclean: clean
-rm -fr lib lib32 lib64
cd progs/demos && $(MAKE) -f Makefile.X11 realclean || true
cd progs/xdemos && $(MAKE) -f Makefile.X11 realclean || true
cd progs/redbook && $(MAKE) -f Makefile.X11 realclean || true
cd progs/samples && $(MAKE) -f Makefile.X11 realclean || true
# Remove everything not in CVS
cvsclean: realclean
-rm -f acinclude.m4 aclocal.m4
-rm -f conf.h conf.h.in config.guess config.log config.status
-rm -f config.sub configure
-rm -f install-sh libtool ltmain.sh Makefile.in
-rm -f missing mkinstalldirs stamp-h stamp-h.in
DIRECTORY = Mesa-5.1
LIB_NAME = MesaLib-5.1
DEMO_NAME = MesaDemos-5.1
GLU_NAME = MesaGLU-5.1
GLUT_NAME = GLUT-3.7
LIB_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/Make-config \
$(DIRECTORY)/docs/*.html \
$(DIRECTORY)/docs/COPYING \
$(DIRECTORY)/docs/INSTALL.GNU \
$(DIRECTORY)/docs/README.* \
$(DIRECTORY)/docs/RELNOTES* \
$(DIRECTORY)/docs/VERSIONS \
$(DIRECTORY)/docs/*.spec \
$(DIRECTORY)/bin/README \
$(DIRECTORY)/bin/mklib* \
$(DIRECTORY)/descrip.mms \
$(DIRECTORY)/mms-config \
$(DIRECTORY)/xlib.opt \
$(DIRECTORY)/include/GL/internal/glcore.h \
$(DIRECTORY)/include/GL/Makefile.in \
$(DIRECTORY)/include/GL/Makefile.am \
$(DIRECTORY)/include/GL/dmesa.h \
$(DIRECTORY)/include/GL/amesa.h \
$(DIRECTORY)/include/GL/fxmesa.h \
$(DIRECTORY)/include/GL/ggimesa.h \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/include/GL/glx.h \
$(DIRECTORY)/include/GL/glxext.h \
$(DIRECTORY)/include/GL/glx_mangle.h \
$(DIRECTORY)/include/GL/mesa_wgl.h \
$(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)/include/Makefile.in \
$(DIRECTORY)/include/Makefile.am \
$(DIRECTORY)/src/mesa/Makefile* \
$(DIRECTORY)/src/mesa/descrip.mms \
$(DIRECTORY)/src/mesa/mesa.conf \
$(DIRECTORY)/src/mesa/*.def \
$(DIRECTORY)/src/mesa/depend \
$(DIRECTORY)/src/mesa/*.[chS] \
$(DIRECTORY)/src/mesa/array_cache/*.[ch] \
$(DIRECTORY)/src/mesa/array_cache/Makefile* \
$(DIRECTORY)/src/mesa/math/*.[ch] \
$(DIRECTORY)/src/mesa/math/Makefile* \
$(DIRECTORY)/src/mesa/swrast/*.[ch] \
$(DIRECTORY)/src/mesa/swrast/Makefile* \
$(DIRECTORY)/src/mesa/swrast_setup/*.[ch] \
$(DIRECTORY)/src/mesa/swrast_setup/Makefile* \
$(DIRECTORY)/src/mesa/tnl/*.[ch] \
$(DIRECTORY)/src/mesa/tnl/Makefile* \
$(DIRECTORY)/src/mesa/tnl_dd/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/*.[ch] \
$(DIRECTORY)/src/mesa/tnl_dd/imm/NOTES.imm \
$(DIRECTORY)/src/mesa/drivers/windml/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windml/tornado/*.c \
$(DIRECTORY)/src/mesa/drivers/windml/tornado/*.cdf \
$(DIRECTORY)/src/mesa/drivers/windml/man3/*.3 \
$(DIRECTORY)/src/mesa/drivers/windml/man3/*.html \
$(DIRECTORY)/src/mesa/drivers/dos/*.[chS] \
$(DIRECTORY)/src/mesa/drivers/dos/mga/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/beos/*.cpp \
$(DIRECTORY)/src/mesa/drivers/glide/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/glide/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/glide/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/glide/*.def \
$(DIRECTORY)/src/mesa/drivers/glide/X86/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/glide/X86/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/glide/X86/*.[Shc] \
$(DIRECTORY)/src/mesa/drivers/ggi/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/ggi/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/ggi/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/ggi/ggimesa.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/default/*.c \
$(DIRECTORY)/src/mesa/drivers/ggi/default/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/ggi/default/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/ggi/default/genkgi.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/display/*.c \
$(DIRECTORY)/src/mesa/drivers/ggi/display/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/ggi/display/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/ggi/display/fbdev.conf.in \
$(DIRECTORY)/src/mesa/drivers/ggi/include/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/ggi/include/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/ggi/include/ggi/mesa/*.h \
$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/osmesa/Makefile.win \
$(DIRECTORY)/src/mesa/drivers/osmesa/osmesa.def \
$(DIRECTORY)/src/mesa/drivers/osmesa/*.[ch] \
$(DIRECTORY)/src/mesa/sparc/*.[chS] \
$(DIRECTORY)/src/mesa/sparc/Makefile.am \
$(DIRECTORY)/src/mesa/sparc/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/svga/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/svga/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/svga/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*.[ch] \
$(DIRECTORY)/src/mesa/drivers/windows/*.def \
$(DIRECTORY)/src/mesa/drivers/x11/Makefile.am \
$(DIRECTORY)/src/mesa/drivers/x11/Makefile.in \
$(DIRECTORY)/src/mesa/drivers/x11/*.[ch] \
$(DIRECTORY)/src/mesa/x86/*.[ch] \
$(DIRECTORY)/src/mesa/x86/Makefile.am \
$(DIRECTORY)/src/mesa/x86/Makefile.in \
$(DIRECTORY)/src/mesa/x86/*.S \
$(DIRECTORY)/src/glu/sgi/Makefile.am \
$(DIRECTORY)/src/glu/sgi/Makefile.in \
$(DIRECTORY)/src/glu/sgi/Makefile.X11 \
$(DIRECTORY)/src/glu/sgi/Makefile.win \
$(DIRECTORY)/src/glu/sgi/Makefile.DJ \
$(DIRECTORY)/src/glu/sgi/glu.def \
$(DIRECTORY)/src/glu/sgi/dummy.cc \
$(DIRECTORY)/src/glu/sgi/descrip.mms \
$(DIRECTORY)/src/glu/sgi/mesaglu.opt \
$(DIRECTORY)/src/glu/sgi/include/gluos.h \
$(DIRECTORY)/src/glu/sgi/include/Makefile.am \
$(DIRECTORY)/src/glu/sgi/include/Makefile.in \
$(DIRECTORY)/src/glu/sgi/libnurbs/Makefile.am \
$(DIRECTORY)/src/glu/sgi/libnurbs/Makefile.in \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/Makefile.am \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/Makefile.in \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/Makefile.am \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/Makefile.in \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/Makefile.am \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbtess/Makefile.in \
$(DIRECTORY)/src/glu/sgi/libtess/README \
$(DIRECTORY)/src/glu/sgi/libtess/alg-outline \
$(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \
$(DIRECTORY)/src/glu/sgi/libtess/libtess_la_SOURCES \
$(DIRECTORY)/src/glu/sgi/libtess/Makefile.am \
$(DIRECTORY)/src/glu/sgi/libtess/Makefile.in \
$(DIRECTORY)/src/glu/sgi/libutil/*.[ch] \
$(DIRECTORY)/src/glu/sgi/libutil/libutil_la_SOURCES \
$(DIRECTORY)/src/glu/sgi/libutil/Makefile.am \
$(DIRECTORY)/src/glu/sgi/libutil/Makefile.in \
$(DIRECTORY)/src/glu/mesa/README[12] \
$(DIRECTORY)/src/glu/mesa/Makefile* \
$(DIRECTORY)/src/glu/mesa/descrip.mms \
$(DIRECTORY)/src/glu/mesa/mms_depend \
$(DIRECTORY)/src/glu/mesa/*.def \
$(DIRECTORY)/src/glu/mesa/depend \
$(DIRECTORY)/src/glu/mesa/*.[ch] \
$(DIRECTORY)/src/glw/*.[ch] \
$(DIRECTORY)/src/glw/Makefile* \
$(DIRECTORY)/src/glw/README \
$(DIRECTORY)/progs/util/README \
$(DIRECTORY)/progs/util/Makefile.am \
$(DIRECTORY)/progs/util/Makefile.in \
$(DIRECTORY)/progs/util/*.[ch] \
$(DIRECTORY)/progs/util/sampleMakefile \
$(DIRECTORY)/vms/analyze_map.com \
$(DIRECTORY)/vms/xlib.opt \
$(DIRECTORY)/vms/xlib_share.opt
DEMO_FILES = \
$(DIRECTORY)/include/GL/glut.h \
$(DIRECTORY)/include/GL/glutf90.h \
$(DIRECTORY)/src/glut/glx/Makefile* \
$(DIRECTORY)/src/glut/glx/depend \
$(DIRECTORY)/src/glut/glx/*def \
$(DIRECTORY)/src/glut/glx/descrip.mms \
$(DIRECTORY)/src/glut/glx/mms_depend \
$(DIRECTORY)/src/glut/glx/*.[ch] \
$(DIRECTORY)/src/glut/glx.dos/*.[ch] \
$(DIRECTORY)/src/glut/glx.dos/Makefile.DJ \
$(DIRECTORY)/src/glut/glx.dos/PC_HW/*.[chS] \
$(DIRECTORY)/progs/images/* \
$(DIRECTORY)/progs/demos/Makefile* \
$(DIRECTORY)/progs/demos/descrip.mms \
$(DIRECTORY)/progs/demos/*.[ch] \
$(DIRECTORY)/progs/demos/*.cxx \
$(DIRECTORY)/progs/demos/*.dat \
$(DIRECTORY)/progs/demos/README \
$(DIRECTORY)/progs/xdemos/Makefile* \
$(DIRECTORY)/progs/xdemos/descrip.mms \
$(DIRECTORY)/progs/xdemos/*.[chf] \
$(DIRECTORY)/progs/redbook/Makefile* \
$(DIRECTORY)/progs/redbook/README \
$(DIRECTORY)/progs/redbook/*.[ch] \
$(DIRECTORY)/progs/samples/Makefile* \
$(DIRECTORY)/progs/samples/README \
$(DIRECTORY)/progs/samples/*.c \
$(DIRECTORY)/progs/windml/Makefile.ugl \
$(DIRECTORY)/progs/windml/*.c \
$(DIRECTORY)/progs/windml/*.bmp \
$(DIRECTORY)/progs/ggi/*.c
SI_GLU_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/Make-config \
$(DIRECTORY)/bin/mklib* \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/src/glu/sgi/Makefile.X11 \
$(DIRECTORY)/src/glu/sgi/include/gluos.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/interface/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/internals/*.cc \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbstess/*.h \
$(DIRECTORY)/src/glu/sgi/libnurbs/nurbstess/*.cc \
$(DIRECTORY)/src/glu/sgi/libtess/README \
$(DIRECTORY)/src/glu/sgi/libtess/alg-outline \
$(DIRECTORY)/src/glu/sgi/libtess/*.[ch] \
$(DIRECTORY)/src/glu/sgi/libutil/*.[ch]
GLU_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/Make-config \
$(DIRECTORY)/bin/mklib* \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/src/glu/mesa/README[12] \
$(DIRECTORY)/src/glu/mesa/Makefile* \
$(DIRECTORY)/src/glu/mesa/descrip.mms \
$(DIRECTORY)/src/glu/mesa/mms_depend \
$(DIRECTORY)/src/glu/mesa/*.def \
$(DIRECTORY)/src/glu/mesa/depend \
$(DIRECTORY)/src/glu/mesa/*.[ch]
GLUT_FILES = \
$(DIRECTORY)/Makefile* \
$(DIRECTORY)/Make-config \
$(DIRECTORY)/bin/mklib* \
$(DIRECTORY)/include/GL/gl.h \
$(DIRECTORY)/include/GL/gl_mangle.h \
$(DIRECTORY)/include/GL/glext.h \
$(DIRECTORY)/include/GL/glu.h \
$(DIRECTORY)/include/GL/glu_mangle.h \
$(DIRECTORY)/include/GL/glut.h \
$(DIRECTORY)/include/GL/glutf90.h \
$(DIRECTORY)/src/glut/glx/Makefile* \
$(DIRECTORY)/src/glut/glx/depend \
$(DIRECTORY)/src/glut/glx/*def \
$(DIRECTORY)/src/glut/glx/descrip.mms \
$(DIRECTORY)/src/glut/glx/mms_depend \
$(DIRECTORY)/src/glut/glx/*.[ch]
lib_gz:
cp Makefile.X11 Makefile ; \
cd .. ; \
tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
gzip $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.gz $(DIRECTORY)
demo_gz:
cd .. ; \
tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
gzip $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.gz $(DIRECTORY)
lib_bz2:
cp Makefile.X11 Makefile ; \
cd .. ; \
tar -cvf $(LIB_NAME).tar $(LIB_FILES) ; \
bzip2 $(LIB_NAME).tar ; \
mv $(LIB_NAME).tar.bz2 $(DIRECTORY)
demo_bz2:
cd .. ; \
tar -cvf $(DEMO_NAME).tar $(DEMO_FILES) ; \
bzip2 $(DEMO_NAME).tar ; \
mv $(DEMO_NAME).tar.bz2 $(DIRECTORY)
lib_zip:
-rm $(LIB_NAME).zip ; \
cp Makefile.X11 Makefile ; \
cd .. ; \
zip -r $(LIB_NAME).zip $(LIB_FILES) ; \
mv $(LIB_NAME).zip $(DIRECTORY)
demo_zip:
-rm $(DEMO_NAME).zip ; \
cd .. ; \
zip -r $(DEMO_NAME).zip $(DEMO_FILES) ; \
mv $(DEMO_NAME).zip $(DIRECTORY)
md5:
@-md5sum $(LIB_NAME).tar.gz
@-md5sum $(LIB_NAME).tar.bz2
@-md5sum $(LIB_NAME).zip
@-md5sum $(DEMO_NAME).tar.gz
@-md5sum $(DEMO_NAME).tar.bz2
@-md5sum $(DEMO_NAME).zip
# Everything for new Mesa release:
tarballs: lib_gz demo_gz lib_bz2 demo_bz2 lib_zip demo_zip md5
# not used
glu_gz:
cp Makefile.X11 Makefile ; \
cd .. ; \
tar -cvf $(GLU_NAME).tar $(GLU_FILES) ; \
gzip $(GLU_NAME).tar ; \
mv $(GLU_NAME).tar.gz $(DIRECTORY)
glut_gz:
cp Makefile.X11 Makefile ; \
cd .. ; \
tar -cvf $(GLUT_NAME).tar $(GLUT_FILES) ; \
gzip $(GLUT_NAME).tar ; \
mv $(GLUT_NAME).tar.gz $(DIRECTORY)

View File

@@ -20,9 +20,9 @@
# 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.
# MinGW makefile v1.0 for Mesa
# MinGW makefile v1.2 for Mesa
#
# Copyright (C) 2002 - Borca Daniel
# Copyright (C) 2002 - Daniel Borca
# Email : dborca@users.sourceforge.net
# Web : http://www.geocities.com/dborca
@@ -40,15 +40,10 @@
# As a consequence, you'll need the Win32 Glide3
# library to build any application.
# default = no
# HAVE_X86=1 optimize for i386.
# ICD=1 build the installable client driver interface
# (windows opengl driver interface)
# default = no
# HAVE_MMX=1 allow MMX specializations, provided your assembler
# supports MMX instruction set. However, the true CPU
# capabilities are checked at run-time to avoid crashes.
# default = no
# HAVE_SSE=1 (see HAVE_MMX)
# default = no
# HAVE_3DNOW=1 (see HAVE_MMX)
# X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
# default = no
#
# Targets:
@@ -64,8 +59,14 @@
CPU ?= pentium
CFLAGS = -Wall -W -pedantic
CFLAGS += -O2 -ffast-math -mcpu=$(CPU)
ifeq ($(ICD),1)
# when -std=c99 mingw will not define WIN32
CFLAGS = -Wall -W -Werror
else
# I love c89
CFLAGS = -Wall -W -pedantic
endif
CFLAGS += -O2 -ffast-math -mtune=$(CPU)
export CFLAGS

View File

@@ -44,6 +44,9 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name glapi
End Project Dependency
Begin Project Dependency
Project_Dep_Name shader
End Project Dependency
}}}
###############################################################################
@@ -75,21 +78,6 @@ Package=<4>
###############################################################################
Project: "glut"=".\src\glut\glx\glut.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name glu
End Project Dependency
}}}
###############################################################################
Project: "main"=".\SRC\MESA\main\main.dsp" - Package Owner=<4>
Package=<5>
@@ -129,6 +117,18 @@ Package=<4>
###############################################################################
Project: "shader"=".\SRC\MESA\shader\shader.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "swrast"=".\SRC\MESA\swrast\swrast.dsp" - Package Owner=<4>
Package=<5>

57
bin/installmesa Executable file
View File

@@ -0,0 +1,57 @@
#!/bin/sh
#
# Simple shell script for installing Mesa's header and library files.
# If the copy commands below don't work on a particular system (i.e. the
# -f or -d flags), we may need to branch on `uname` to do the right thing.
#
TOP=.
INCLUDE_DIR="/usr/local/include"
LIB_DIR="/usr/local/lib"
echo
echo "***** Mesa installation - You may need root privileges to do this *****"
echo
echo "Default directory for header files is:" ${INCLUDE_DIR}
echo "Enter new directory or press <Enter> to accept this default."
read INPUT
if [ x${INPUT} != "x" ] ; then
INCLUDE_DIR=${INPUT}
fi
echo
echo "Default directory for library files is:" ${LIB_DIR}
echo "Enter new directory or press <Enter> to accept this default."
read INPUT
if [ x${INPUT} != "x" ] ; then
LIB_DIR=${INPUT}
fi
echo
echo "About to install Mesa header files (GL/*.h) in: " ${INCLUDE_DIR}/GL
echo "and Mesa library files (libGL.*, etc) in: " ${LIB_DIR}
echo "Press <Enter> to continue, or <ctrl>-C to abort."
read INPUT
# flags:
# -f = force
# -d = preserve symlinks
set -v
mkdir ${INCLUDE_DIR}
mkdir ${INCLUDE_DIR}/GL
mkdir ${LIB_DIR}
cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
cp -fd ${TOP}/lib*/lib* ${LIB_DIR}
echo "Done."

604
bin/mklib
View File

@@ -1,14 +1,15 @@
#!/bin/sh
# Make a shared library.
# Basically do a switch/case depending on the OS and make a shared
# lib conforming to that OS.
# Basically do a switch/case depending on the OS and make a shared (or static)
# library conforming to that OS.
# Usage:
# mklib [options] objects ...
# Options:
# -o LIBRARY specifies the name of resulting library ("GL" for example)
# -o LIBRARY specifies the name of resulting library
# ("-o GL" for example, might result in "libGL.so" being made)
# -major N specifies major version number (default is 1)
# -minor N specifies minor version number (default is 0)
# -patch N specifies patch version number (default is 0)
@@ -16,12 +17,15 @@
# -LDIR search in DIR for library dependencies
# -cplusplus link with C++ runtime
# -static make a static library (default is dynamic/shared)
# -install DIR move resulting library files to DIR
# -install DIR move resulting library file(s) to DIR
# -arch ARCH override using `uname` to determine architecture
# -archopt OPT specify an extra achitecture-specific option OPT
# -noprefix don't prefix library name with "lib" or any suffix
# -exports FILE only export the symbols listed in FILE
#
# The library name should just be "GL" or "GLU", etc. The 'lib' prefix
# will be added here if needed, as well as the ".so" or ".a" suffix, etc.
# will be added here if needed, as well as the ".so" or ".a" suffix,
# etc (unless the -noprefix option is used).
#
# objects should be: foo.o bar.o etc.o
#
@@ -37,13 +41,15 @@
LIBNAME=""
MAJOR=1
MINOR=0
PATCH=0
PATCH=""
DEPS=""
CPLUSPLUS=0
STATIC=0
INSTALLDIR="."
ARCH="auto"
ARCHOPT=""
NOPREFIX=0
EXPORTS=""
#
@@ -63,6 +69,8 @@ do
'-install') shift 1; INSTALLDIR=$1;;
'-arch') shift 1; ARCH=$1;;
'-archopt') shift 1; ARCHOPT=$1;;
'-noprefix') NOPREFIX=1;;
'-exports') shift 1; EXPORTS=$1;;
-*) echo "mklib: Unknown option: " $1 ; exit 1;;
*) break
esac
@@ -99,6 +107,7 @@ if [ ] ; then
echo MINOR is $MINOR
echo PATCH is $PATCH
echo DEPS are $DEPS
echo "EXPORTS in" $EXPORTS
echo "-----------------"
fi
@@ -108,143 +117,287 @@ fi
#
case $ARCH in
'Linux')
LIBNAME="lib${LIBNAME}" # prefix with "lib"
OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
VERSION="${MAJOR}.${MINOR}.${PATCH}"
'Linux' | 'OpenBSD')
# we assume gcc
echo "mklib: Making Linux shared library: " ${LIBNAME}.so.${VERSION}
if [ $CPLUSPLUS = 1 ] ; then
LINK="g++"
else
LINK="gcc"
# Set default compilers if env vars not set
if [ "x$CXX" = "x" ] ; then
CXX=g++
fi
if [ "x$CC" = "x" ] ; then
CC=gcc
fi
# rm any old libs
rm -f ${LIBNAME}.so.${VERSION}
rm -f ${LIBNAME}.so.${MAJOR}
rm -f ${LIBNAME}.so
if [ $NOPREFIX = 1 ] ; then
# No "lib" or ".so" part
echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}
#OPTS="-shared -Wl,-soname,${LIBNAME}" # soname???
OPTS="-shared"
if [ $CPLUSPLUS = 1 ] ; then
LINK=$CXX
else
LINK=$CC
fi
rm -f ${LIBNAME}
# make lib
${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
# finish up
FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
# make lib
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
# finish up
FINAL_LIBS="${LIBNAME}"
elif [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}" # prefix with "lib"
echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
LINK="ar"
OPTS="-ru"
# make lib
${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
ranlib ${LIBNAME}.a
# finish up
FINAL_LIBS=${LIBNAME}.a
else
LIBNAME="lib${LIBNAME}" # prefix with "lib"
if [ $ARCH = 'Linux' ] ; then
OPTS="-Xlinker -Bsymbolic -shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
else
OPTS="-shared -Wl,-soname,${LIBNAME}.so.${MAJOR}"
fi
if [ $EXPORTS ] ; then
#OPTS="${OPTS} -Xlinker --retain-symbols-file ${EXPORTS}"
# Make the 'exptmp' file for --version-script option
echo "VERSION_${MAJOR}.${MINOR} {" > exptmp
echo "global:" >> exptmp
sed 's/$/;/' ${EXPORTS} >> exptmp
echo "local:" >> exptmp
echo "*;" >> exptmp
echo "};" >> exptmp
OPTS="${OPTS} -Xlinker --version-script=exptmp"
# exptmp is removed below
fi
if [ x${PATCH} = "x" ] ; then
VERSION="${MAJOR}.${MINOR}"
else
VERSION="${MAJOR}.${MINOR}.${PATCH}"
fi
echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION}
if [ $CPLUSPLUS = 1 ] ; then
LINK=$CXX
else
LINK=$CC
fi
# rm any old libs
rm -f ${LIBNAME}.so.${VERSION}
rm -f ${LIBNAME}.so.${MAJOR}
rm -f ${LIBNAME}.so
# make lib
${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
# finish up
FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
# rm -f exptmp
fi
;;
'SunOS')
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making SunOS shared library: " ${LIBNAME}
OPTS="-G"
if [ $CPLUSPLUS = 1 ] ; then
# link for C++
if [ "x${CXX}" = "xg++" ] ; then
LINK="g++"
elif [ "x${CXX}" = "xCC" ] ; then
LINK="CC"
elif [ `which c++` ] ; then
LINK="c++"
elif [ `type g++` ] ; then
LINK="g++"
else
echo "mklib: warning: can't find C++ comiler, trying CC."
LINK="CC"
fi
elif [ "x${CC}" = "xgcc" ] ; then
# use gcc for linking
LINK="gcc"
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making SunOS static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar -ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
# use native Sun linker
LINK="ld"
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making SunOS shared library: " ${LIBNAME}
# XXX OPTS for gcc should be -shared, but that doesn't work.
# Using -G does work though.
if [ $CPLUSPLUS = 1 ] ; then
# determine linker and options for C++ code
if [ "x${CXX}" = "xg++" ] ; then
# use g++
LINK="g++"
OPTS="-G"
elif [ "x${CXX}" = "xCC" ] ; then
# use Sun CC
LINK="CC"
OPTS="-G"
elif [ "x${CXX}" = "xc++" ] ; then
# use Sun c++
LINK="c++"
OPTS="-G"
elif [ `which c++` ] ; then
# use Sun c++
LINK="c++"
OPTS="-G"
elif [ `type g++` ] ; then
# use g++
LINK="g++"
OPTS="-G"
else
echo "mklib: warning: can't find C++ comiler, trying CC."
LINK="CC"
OPTS="-G"
fi
elif [ "x${CC}" = "xgcc" ] ; then
# use gcc for linking
LINK="gcc"
OPTS="-G"
else
# use native Sun linker
LINK="ld"
OPTS="-G"
fi
echo "mklib: linker is" ${LINK} ${OPTS}
rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
FINAL_LIBS="${LIBNAME}.${MAJOR} ${LIBNAME}"
fi
echo "mklib: linker is " ${LINK}
rm -f ${LIBNAME}
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
;;
'FreeBSD')
SHLIB="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
STLIB="lib${LIBNAME}.a"
echo "mklib: Making FreeBSD shared library: " ${SHLIB}
rm -f ${SHLIB} ${STLIB}
ar cq ${STLIB} ${OBJECTS}
ranlib ${STLIB}
ld -Bshareable -o ${SHLIB} ${OBJECTS}
# XXX make lib${LIBNAME}.so.${MAJOR} symlink?
FINAL_LIBS="${SHLIB} ${STLIB}"
;;
'OpenBSD')
LIBNAME="lib${LIBNAME}"
VERSION="${MAJOR}.${MINOR}"
echo "Building OpenBSD PIC library: " ${LIBNAME}
rm -f ${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION}
ar cq ${LIBNAME}_pic.a ${OBJECTS}
ranlib ${LIBNAME}_pic.a
ld -x -Bshareable -Bforcearchive -o ${LIBNAME}.so.${VERSION} ${LIBNAME}_pic.a
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so
FINAL_LIBS="${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION} ${LIBNAME}.so"
if [ $NOPREFIX = 1 ] ; then
# No "lib" or ".so" part
echo "mklib: Making FreeBSD shared library: " ${LIBNAME}
rm -f ${LIBNAME}
ld -Bshareable -o ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
elif [ $STATIC = 1 ] ; then
STLIB="lib${LIBNAME}.a"
echo "mklib: Making FreeBSD static library: " ${STLIB}
rm -f ${STLIB}
ar cq ${STLIB} ${OBJECTS}
ranlib ${STLIB}
FINAL_LIBS=${STLIB}
else
SHLIB="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
echo "mklib: Making FreeBSD shared library: " ${SHLIB}
rm -f ${SHLIB}
ld -Bshareable -o ${SHLIB} ${OBJECTS}
# XXX make lib${LIBNAME}.so.${MAJOR} symlink?
FINAL_LIBS=${SHLIB}
fi
;;
'NetBSD')
LIBNAME="lib${LIBNAME}"
echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
VERSION="${MAJOR}.${MINOR}"
rm -f ${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION}
ar cq ${LIBNAME}_pic.a ${OBJECTS}
ranlib ${LIBNAME}_pic.a
ld -x -Bshareable -Bforcearchive -o ${LIBNAME}.so.${VERSION} ${LIBNAME}_pic.a
FINAL_LIBS="${LIBNAME}_pic.a ${LIBNAME}.so.${VERSION}"
;;
'IRIX')
LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
if [ $ARCHOPTS = "64" ] ; then
# 64-bit ABI
OPTS="-64 -shared -all"
echo "mklib: Making IRIX 64-bit shared library: " ${LIBNAME}
elif [ $ARCHOPTS = "o32" ] ; then
# old 32-bit ABI
OPTS="-32 -shared -all"
echo "mklib: Making IRIX o32-bit shared library: " ${LIBNAME}
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}_pic.a"
echo "mklib: Making NetBSD PIC static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar cq ${LIBNAME} ${OBJECTS}
ranlib ${LIBNAME}
FINAL_LIBS=${LIBNAME}
else
# new 32-bit ABI
OPTS="-n32 -shared -all"
echo "mklib: Making IRIX n32-bit shared library: " ${LIBNAME}
LIBNAME="lib${LIBNAME}.so.${MAJOR}.${MINOR}"
echo "mklib: Making NetBSD PIC shared library: " ${LIBNAME}
rm -f ${LIBNAME}
ld -x -Bshareable -Bforcearchive -o ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
fi
ld ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS="${LIBNAME}"
;;
'IRIX64')
LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
echo "mklib: Making IRIX64 library: " ${LIBNAME}
# 64-bit ABI
OPTS="-64 -shared -all"
ld ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS="${LIBNAME}"
'IRIX' | 'IRIX64')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
rm -f ${LIBNAME}
ar rc ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
if [ $ARCHOPT = "64" ] ; then
# 64-bit ABI
OPTS="-64 -shared -all"
echo "mklib: Making IRIX 64-bit shared library: " ${LIBNAME}
elif [ $ARCHOPT = "o32" ] ; then
# old 32-bit ABI
OPTS="-32 -shared -all"
echo "mklib: Making IRIX o32-bit shared library: " ${LIBNAME}
else
# new 32-bit ABI
OPTS="-n32 -shared -all"
echo "mklib: Making IRIX n32-bit shared library: " ${LIBNAME}
fi
if [ $CPLUSPLUS = 1 ] ; then
LINK="CC"
else
LINK="ld"
fi
${LINK} ${OPTS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
fi
;;
'linux-cygwin')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making linux-cygwin library: " ${LIBNAME}
rm -f ${LIBNAME}
gnuwin32ar ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
;;
'HPUX')
RUNLIB="lib${LIBNAME}.${MAJOR}"
DEVLIB="lib${LIBNAME}.sl"
echo "mklib: Making HPUX library: " ${RUNLIB} ${DEVLIB}
ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
ln -s ${RUNLIB} ${DEVLIB}
FINAL_LIBS="{RUNLIB} ${DEVLIB}"
'HP-UX')
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making HP-UX static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar -ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
RUNLIB="lib${LIBNAME}.${MAJOR}"
DEVLIB="lib${LIBNAME}.sl"
echo "mklib: Making HP-UX shared library: " ${RUNLIB} ${DEVLIB}
ld -b -o ${RUNLIB} +b ${RUNLIB} ${OBJECTS} ${DEPS}
ln -s ${RUNLIB} ${DEVLIB}
FINAL_LIBS="${RUNLIB} ${DEVLIB}"
fi
;;
'AIX' | 'AIX64')
if [ $ARCH = "AIX64" ] ; then
X64="-X64"
fi
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making AIX static library: " ${LIBNAME}
ar -ruv ${X64} ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
EXPFILE="lib${LIBNAME}.exp"
OFILE=shr.o #Want to be consistent with the IBM libGL.a
LIBNAME="lib${LIBNAME}.a" # shared objects are still stored in the .a libraries
if [ $ARCH = "AIX64" ] ; then
OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry -q64"
else
OPTS="-bE:${EXPFILE} -bM:SRE -bnoentry"
fi
rm -f ${EXPFILE} ${OFILE}
NM="/bin/nm -eC ${X64}"
echo "#! /usr/lib/${LIBNAME}" > ${EXPFILE}
${NM} ${OBJECTS} | awk '{
if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
&& ( substr($1,1,1) != ".")) {
if (substr ($1, 1, 7) != "__sinit" &&
substr ($1, 1, 7) != "__sterm") {
if (substr ($1, 1, 5) == "__tf1")
print (substr ($1, 7))
else if (substr ($1, 1, 5) == "__tf9")
print (substr ($1, 15))
else
print $1
}
}
}' | sort -u >> ${EXPFILE}
cc ${OPTS} -o ${OFILE} ${OBJECTS} ${DEPS}
ar ${X64} -r ${LIBNAME} ${OFILE}
FINAL_LIBS="${LIBNAME}"
fi
;;
'OpenSTEP')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making OpenSTEP static library: " ${LIBNAME}
@@ -253,45 +406,70 @@ case $ARCH in
;;
'OSF1')
VERSION="${MAJOR}.${MINOR}"
LIBNAME="lib${LIBNAME}.so"
ARNAME="lib${LIBNAME}.a"
echo "mklib: Making OSF/1 library: " ${LIBNAME}
rm -f ${LIBNAME}.${VERSION}
ld -o ${LIBNAME}.${VERSION} -shared -no_archive -set_version ${VERSION} -soname ${LIBNAME}.${VERSION} -expect_unresolved \* -all ${OBJECTS} ${DEPS}
ln -sf ${LIBNAME}.${VERSION} ${LIBNAME}
# also make static lib
rm -f ${ARNAME}
ar clqz ${ARNAME} ${OBJECTS}
FINAL_LIBS="${ARNAME} ${LIBNAME} ${LIBNAME}.${VERSION}"
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making OSF/1 static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar -ruv ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
VERSION="${MAJOR}.${MINOR}"
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making OSF/1 shared library: " ${LIBNAME}
if [ $CPLUSPLUS = 1 ] ; then
LINK=$CXX
else
LINK=$CC
fi
rm -f ${LIBNAME}.${VERSION}
${LINK} -o ${LIBNAME}.${VERSION} -shared -set_version ${VERSION} -soname ${LIBNAME}.${VERSION} -expect_unresolved \* -all ${OBJECTS} ${DEPS}
ln -sf ${LIBNAME}.${VERSION} ${LIBNAME}
FINAL_LIBS="${LIBNAME} ${LIBNAME}.${VERSION}"
fi
;;
'Darwin')
VERSION="${MAJOR}.${MINOR}.${TINY}"
LIBNAME="lib${LIBNAME}.dylib"
ARNAME="lib${LIBNAME}.dylib.a"
echo "mklib: Making Darwin libraries: " ${LIBNAME} ${ARNAME}
FLAGS="-dynamiclib -multiply_defined suppress"
cc ${FLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
# also make regular .a files,
# provided by Danek Duvall (duvall@dhduvall.student.princeton.edu)
ar ruv ${ARNAME} ${OBJECTS}
ranlib ${ARNAME}
FINAL_LIBS="${ARNAME} ${LIBNAME}"
;;
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making Darwin static library: " ${LIBNAME}
LINK="ar"
OPTS="-ruv"
${LINK} ${OPTS} ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
LIBNAME="${LIBNAME}.dylib"
echo "mklib: Making Darwin shared library: " ${LIBNAME}
FLAGS="-dynamiclib -multiply_defined suppress"
if [ $CPLUSPLUS = 1 ] ; then
LINK="g++"
else
LINK="cc"
fi
${LINK} ${FLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS=${LIBNAME}
fi
;;
'LynxOS')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making LynxOS library: " ${LIBNAME}
echo "mklib: Making LynxOS static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar ru ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
;;
'BeOS')
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making BeOS shared library: " ${LIBNAME}
gcc -nostart -Xlinker -soname=${LIBNAME} -L/Be/develop/lib/x86 ${OBJECTS} -lbe -o ${LIBNAME}
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making BeOS static library: " ${LIBNAME}
ar -cru "${LIBNAME}" ${OBJECTS}
else
LIBNAME="lib${LIBNAME}.so"
echo "mklib: Making BeOS shared library: " ${LIBNAME}
gcc -nostart -Xlinker "-soname=${LIBNAME}" -L/Be/develop/lib/x86 -lbe ${DEPS} ${OBJECTS} -o "${LIBNAME}"
mimeset -f "${LIBNAME}"
setversion "${LIBNAME}" -app ${MAJOR} ${MINOR} ${PATCH} -short "Powered by Mesa3D!" -long "Powered by Mesa3D!"
fi
FINAL_LIBS=${LIBNAME}
;;
@@ -302,22 +480,142 @@ case $ARCH in
FINAL_LIBS=${LIBNAME}
;;
'example')
# If you're adding support for a new architecture, you can
# start with this:
LIBNAME="lib${LIBNAME}.so" # prefix with "lib"
echo "mklib: Making library for example arch: " ${LIBNAME}
ld -o ${LIBNAME} ${OBJECTS} ${DEPS}
'MorphOS')
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making MorphOS library: " ${LIBNAME}
ppc-morphos-ar rc ${LIBNAME} ${OBJECTS}
FINAL_LIBS="${LIBNAME}"
;;
'icc')
# Intel C compiler
LIBNAME="lib${LIBNAME}" # prefix with "lib"
if [ $STATIC = 1 ] ; then
echo "mklib: Making Intel ICC static library: " ${LIBNAME}.a
LINK="ar"
OPTS="-ruv"
# make lib
${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
# finish up
FINAL_LIBS="${LIBNAME}.a"
else
OPTS="-shared"
VERSION="${MAJOR}.${MINOR}.${PATCH}"
echo "mklib: Making Intel ICC shared library: " ${LIBNAME}.so.${VERSION}
if [ $CPLUSPLUS = 1 ] ; then
LINK="icc"
else
LINK="icc"
fi
# rm any old libs
rm -f ${LIBNAME}.so.${VERSION}
rm -f ${LIBNAME}.so.${MAJOR}
rm -f ${LIBNAME}.so
# make lib
${LINK} ${OPTS} -o ${LIBNAME}.so.${VERSION} ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR}
ln -s ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so
# finish up
FINAL_LIBS="${LIBNAME}.so.${VERSION} ${LIBNAME}.so.${MAJOR} ${LIBNAME}.so"
fi
;;
'aix-gcc')
# AIX with gcc
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making AIX GCC static library: " ${LIBNAME}
rm -f ${LIBNAME}
ar ru ${LIBNAME} ${OBJECTS}
FINAL_LIBS=${LIBNAME}
else
LIBNAME="lib${LIBNAME}.so" # prefix with "lib", suffix with ".so"
echo "mklib: Making AIX GCC shared library: " ${LIBNAME}
# remove old lib
rm -f ${LIBNAME}
# make the lib
gcc -shared -Wl,-G ${OBJECTS} ${DEPS} -o ${LIBNAME}
# NOTE: the application linking with this library must specify
# the -Wl,-brtl flags to gcc
FINAL_LIBS=${LIBNAME}
fi
;;
'ultrix')
# XXX untested
if [ $STATIC = 0 ] ; then
echo "mklib: Warning shared libs not supported on Ultrix"
fi
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making static library for Ultrix: " ${LIBNAME}
rm -f ${LIBNAME}
ar ru ${LIBNAME} ${OBJECTS}
FINAL_LIBS="${LIBNAME}"
;;
CYGWIN*)
# GCC-based environment
CYGNAME="cyg${LIBNAME}" # prefix with "cyg"
LIBNAME="lib${LIBNAME}" # prefix with "lib"
if [ $STATIC = 1 ] ; then
echo "mklib: Making" $ARCH "static library: " ${LIBNAME}.a
LINK="ar"
OPTS="-ru"
# make lib
${LINK} ${OPTS} ${LIBNAME}.a ${OBJECTS}
ranlib ${LIBNAME}.a
# finish up
FINAL_LIBS=${LIBNAME}.a
else
OPTS="-shared -Wl,-export-all -Wl,--out-implib=${LIBNAME}-${MAJOR}.dll.a"
echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}-${MAJOR}.dll
if [ $CPLUSPLUS = 1 ] ; then
LINK="g++"
else
LINK="gcc"
fi
# rm any old libs
rm -f ${LIBNAME}-${MAJOR}.dll
rm -f ${LIBNAME}.dll.a
rm -f ${LIBNAME}.a
# make lib
${LINK} ${OPTS} -o ${CYGNAME}-${MAJOR}.dll ${OBJECTS} ${DEPS}
# make usual symlinks
ln -s ${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a
# finish up
FINAL_LIBS="${LIBNAME}-${MAJOR}.dll.a ${LIBNAME}.dll.a"
# special case for installing in bin
FINAL_BINS="${CYGNAME}-${MAJOR}.dll"
fi
;;
'example')
# If you're adding support for a new architecture, you can
# start with this:
if [ $STATIC = 1 ] ; then
LIBNAME="lib${LIBNAME}.a"
echo "mklib: Making static library for example arch: " ${LIBNAME}
rm -f ${LIBNAME}
ar rv ${LIBNAME} ${OBJECTS}
FINAL_LIBS="${LIBNAME}"
else
LIBNAME="lib${LIBNAME}.so" # prefix with "lib"
echo "mklib: Making shared library for example arch: " ${LIBNAME}
ld -o ${LIBNAME} ${OBJECTS} ${DEPS}
FINAL_LIBS="${LIBNAME}"
fi
;;
*)
echo "mklib: WARNING: making library for unknown platform!"
echo "mklib: WARNING: this may not work!"
echo "mklib: WARNING: please update the bin/mklib script!"
# XXX this is a total hack for Mesa - remove someday
# fall-back to an old mklib.* script
${MAKELIB} "lib${LIBNAME}.a" ${MAJOR} ${MINOR} ${PATCH} ${OBJECTS}
echo "mklib: ERROR: Don't know how to make a static/shared library for" ${ARCH}
echo "mklib: Please add necessary commands to mklib script."
;;
esac

View File

@@ -1,153 +0,0 @@
#!/bin/ksh
# Make an AIX shared library (tricky!!!)
# Based on a script from Athanasios G. Gaitatzes (gaitat@vnet.ibm.com)
# Improved by Greg Thompson <gregt@visix.com> -gt
#--identification------------------------------------------------------
# $Id: mklib.aix,v 1.2 1999/09/15 15:10:20 brianp Exp $
# $Log: mklib.aix,v $
# Revision 1.2 1999/09/15 15:10:20 brianp
# added third, tiny version number to arguments
#
# Revision 1.1 1999/08/19 13:52:56 brianp
# initial check-in (post-crash)
#
#--common--------------------------------------------------------------
LIBRARY=$1
shift 1
MAJOR=$1
shift 1
MINOR=$1
shift 1
TINY=$1
shift 1
OBJECTS=$*
#--platform------------------------------------------------------------
# BASENAME = LIBRARY without .a suffix
BASENAME=`echo ${LIBRARY} | sed "s/\.a//g"`
# Name of exports file
EXPFILE=${BASENAME}.exp
# Name of temporary shared lib file
OFILE=shr.o
####OFILE=${BASENAME}.o
# Remove any old files from previous make
rm -f ${LIBRARY} ${EXPFILE} ${OFILE}
# Pick a way to use nm -gt
NM=${NM-/bin/nm -eC}
# Determine which version of AIX this is
AIXVERSION=`uname -v`
# Pick a way to tell the linker there's no entrypoint -gt
case ${AIXVERSION}
{
3*)
ENTRY='-e _nostart'
;;
4*)
ENTRY=-bnoentry
;;
*)
echo "Error in mklib.aix!"
exit 1
;;
}
# Other libraries which we may be dependent on. Since we make the libraries
# in the order libGL.a, libaGLU.a, libglut.a just depends on its predecessor.
# modified to make otherlibs in the form of -lfoo -gt
OTHERLIBS=`ls ../lib/*.a | sed "s/..\/lib\/lib/-l/g" | sed "s/\.a//g"`
##echo OTHERLIBS are ${OTHERLIBS}
# Make exports (.exp) file header
echo "#! ${LIBRARY}" > ${EXPFILE}
# Append list of exported symbols to exports file -gt
case ${AIXVERSION}
{
3*)
${NM} ${OBJECTS} | awk -F'|' '{
if ($3 != "extern" || substr($7,1,1) == " ") continue
sub (" *", "", $1); sub (" *", "", $7)
if ( (($7 == ".text") || ($7 == ".data") || ($7 == ".bss")) \
&& ( substr($1,1,1) != ".")) {
if (substr ($1, 1, 7) != "__sinit" &&
substr ($1, 1, 7) != "__sterm") {
if (substr ($1, 1, 5) == "__tf1")
print (substr ($1, 7))
else if (substr ($1, 1, 5) == "__tf9")
print (substr ($1, 15))
else
print $1
}
}
}' | sort -u >> ${EXPFILE}
;;
4*)
${NM} ${OBJECTS} | awk '{
if ((($2 == "T") || ($2 == "D") || ($2 == "B")) \
&& ( substr($1,1,1) != ".")) {
if (substr ($1, 1, 7) != "__sinit" &&
substr ($1, 1, 7) != "__sterm") {
if (substr ($1, 1, 5) == "__tf1")
print (substr ($1, 7))
else if (substr ($1, 1, 5) == "__tf9")
print (substr ($1, 15))
else
print $1
}
}
}' | sort -u >> ${EXPFILE}
;;
}
# This next line is a hack to allow full compatibility with IBM's OpenGL
# libraries. IBM mistakenly exports glLoadIdentity from the libGLU.a
# library. We have to do the same thing. Problem reported by Yemi Adesanya
# (adesanya@afsmail.cern.ch) and Patrick Brown (pbrown@austin.ibm.com)
if [ "${BASENAME}" = libGLU ] ; then
echo "glLoadIdentity" >> ${EXPFILE}
fi
# Make the shared lib file
cc -o ${OFILE} ${OBJECTS} -L../lib ${OTHERLIBS} -lX11 -lXext -lXmu -lXi -lm -lc -bE:${EXPFILE} -bM:SRE ${ENTRY}
# Make the .a file
ar ruv ${LIBRARY} ${OFILE}
# Put exports file in Mesa lib directory
mv ${EXPFILE} ../lib
# Remove OFILE
rm -f ${OFILE}
#NOTES
# AIX 4.x /usr/bin/nm -B patch from ssclift@mach.me.queensu.ca (Simon Clift)
# Robustified symbol extraction for AIX 3 and 4
# Greg Thompson <gregt@visix.com>

View File

@@ -1,38 +0,0 @@
#!/bin/sh
# Make a standard Unix .a library file with 'ar ruv'
#--identification------------------------------------------------------
# $Id: mklib.ar-ruv,v 1.2 1999/09/15 15:10:20 brianp Exp $
# $Log: mklib.ar-ruv,v $
# Revision 1.2 1999/09/15 15:10:20 brianp
# added third, tiny version number to arguments
#
# Revision 1.1 1999/08/19 13:52:57 brianp
# initial check-in (post-crash)
#
#--common--------------------------------------------------------------
LIBRARY=$1
shift 1
MAJOR=$1
shift 1
MINOR=$1
shift 1
TINY=$1
shift 1
OBJECTS=$*
#--platform-------------------------------------------------------------
#ar ruv $LIBRARY $OBJECTS
ar ru $LIBRARY $OBJECTS

28
configs/aix Normal file
View File

@@ -0,0 +1,28 @@
# Configuration for AIX, dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = aix
# Compiler and flags
CC = cc
CXX = xlC
CFLAGS = -O -DAIXV3
CXXFLAGS = -O -DAIXV3
MKLIB_OPTIONS =
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -lX11 -lXext -lm
GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC

28
configs/aix-64 Normal file
View File

@@ -0,0 +1,28 @@
# Configuration for AIX 64-bit, dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = aix-64
# Compiler and flags
CC = xlc
CXX = xlC
CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
MKLIB_OPTIONS = -arch AIX64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -lX11 -lXext -lm
GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC

19
configs/aix-gcc Normal file
View File

@@ -0,0 +1,19 @@
# Configuration for AIX with gcc
include $(TOP)/configs/default
CONFIG_NAME = aix-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O2 -DAIXV3
CXXFLAGS = -O2 -DAIXV3
MKLIB_OPTIONS = -arch aix-gcc
GL_LIB_DEPS = -lX11 -lXext -lm
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(LIB_DIR -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
APP_LIB_DEPS = -L$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi

23
configs/aix-static Normal file
View File

@@ -0,0 +1,23 @@
# Configuration for AIX, static libs
include $(TOP)/configs/default
CONFIG_NAME = aix-static
# Compiler and flags
CC = cc
CXX = xlC
CFLAGS = -O -DAIXV3
CXXFLAGS = -O -DAIXV3
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm

99
configs/beos Normal file
View File

@@ -0,0 +1,99 @@
# Configuration for BeOS
# Written by Philippe Houdoin
include $(TOP)/configs/default
CONFIG_NAME = beos
DEFINES = \
-DBEOS_THREADS
MACHINE=$(shell uname -m)
ifeq ($(MACHINE), BePC)
CPU = x86
else
CPU = ppc
endif
ifeq ($(CPU), x86)
# BeOS x86 settings
DEFINES += \
-DGNU_ASSEMBLER \
-DUSE_X86_ASM \
-DUSE_MMX_ASM \
-DUSE_3DNOW_ASM \
-DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
CC = gcc
CXX = g++
LD = gcc
CFLAGS = \
-Wall -Wno-multichar -Wno-ctor-dtor-privacy \
$(DEFINES)
CXXFLAGS = $(CFLAGS)
LDFLAGS += -Xlinker
ifdef DEBUG
CFLAGS += -g -O0
LDFLAGS += -g
DEFINES += -DDEBUG
else
CFLAGS += -O3
endif
GLUT_CFLAGS = -fexceptions
else
# BeOS PPC settings
CC = mwcc
CXX = $(CC)
LD = mwldppc
CFLAGS = \
-w on -requireprotos \
$(DEFINES)
CXXFLAGS = $(CFLAGS)
LDFLAGS += \
-export pragma \
-init _init_routine_ \
-term _term_routine_ \
-lroot \
/boot/develop/lib/ppc/glue-noinit.a \
/boot/develop/lib/ppc/init_term_dyn.o \
/boot/develop/lib/ppc/start_dyn.o
ifdef DEBUG
CFLAGS += -g -O0
CXXFLAGS += -g -O0
LDFLAGS += -g
else
CFLAGS += -O7
CXXFLAGS += -O7
endif
GLUT_CFLAGS = -fexceptions
endif
# Directories
SRC_DIRS = mesa glu glut/beos
GLU_DIRS = sgi
DRIVER_DIRS = beos
PROGRAM_DIRS = beos samples redbook demos tests
# Library/program dependencies
GL_LIB_DEPS =
OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS =
GLUT_LIB_DEPS = -lgame -L$(LIB_DIR) -l$(GL_LIB)
APP_LIB_DEPS = -lbe -L$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)

25
configs/darwin Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for Darwin / MacOS X, making dynamic libs
include $(TOP)/configs/default
CONFIG_NAME = darwin
# Compiler and flags
CC = cc
CXX = cc
CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
# Library names (actual file names)
GL_LIB_NAME = libGL.dylib
GLU_LIB_NAME = libGLU.dylib
GLUT_LIB_NAME = libglut.dylib
GLW_LIB_NAME = libGLw.dylib
OSMESA_LIB_NAME = libOSMesa.dylib
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = $(TOP)/lib/GL.dylib
GLU_LIB_DEPS = $(TOP)/lib/GL.dylib
GLUT_LIB_DEPS =
GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm

24
configs/darwin-static Normal file
View File

@@ -0,0 +1,24 @@
# Configuration for Darwin / MacOS X, making static libs
include $(TOP)/configs/darwin
CONFIG_NAME = darwin-static
# Compiler and flags
CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm

68
configs/default Normal file
View File

@@ -0,0 +1,68 @@
# Default/template configuration
# This is included by other config files which may override some
# of these variables.
CONFIG_NAME = default
# Version info
MESA_MAJOR=6
MESA_MINOR=3
MESA_TINY=0
# external projects
DRM_SOURCE_PATH=$(TOP)/../drm
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -O
CXXFLAGS = -O
GLU_CFLAGS =
# Misc tools and flags
MKLIB_OPTIONS =
MKDEP = makedepend
MKDEP_OPTIONS = -fdepend
MAKE = make
# Library names (base name)
GL_LIB = GL
GLU_LIB = GLU
GLUT_LIB = glut
GLW_LIB = GLw
OSMESA_LIB = OSMesa
# Library names (actual file names)
GL_LIB_NAME = libGL.so
GLU_LIB_NAME = libGLU.so
GLUT_LIB_NAME = libglut.so
GLW_LIB_NAME = libGLw.so
OSMESA_LIB_NAME = libOSMesa.so
# Optional assembly language optimization files for libGL
ASM_SOURCES =
# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
# order to build the Motif widget too)
GLW_SOURCES = GLwDrawA.c
# Directories
LIB_DIR = $(TOP)/lib
INSTALL_PREFIX = /usr/local
SRC_DIRS = mesa glu glut/glx glw
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
PROGRAM_DIRS = demos redbook samples xdemos
# Library/program dependencies
GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

17
configs/freebsd Normal file
View File

@@ -0,0 +1,17 @@
# Configuration for FreeBSD
include $(TOP)/configs/default
CONFIG_NAME = FreeBSD
# Compiler and flags
CC = gcc
CXX = g++
MAKE = gmake
CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
CXXFLAGS = -O2 -fPIC -pedantic
GLUT_CFLAGS = -fexceptions
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

41
configs/freebsd-dri Normal file
View File

@@ -0,0 +1,41 @@
# -*-makefile-*-
# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
include $(TOP)/configs/freebsd
CONFIG_NAME = freebsd-dri
# Compiler and flags
CC = gcc
CXX = g++
WARN_FLAGS = -Wall
OPT_FLAGS = -O
X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
DEFINES = -DDRI_NEW_INTERFACE_ONLY
CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES)
CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
ASM_SOURCES =
# Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
# Directories
SRC_DIRS = mesa glu glut/glx glw glx/x11
DRIVER_DIRS = dri
PROGRAM_DIRS =
WINDOW_SYSTEM=dri
DRM_SOURCE_PATH=$(TOP)/../drm
# ffb and gamma are missing because they have not been converted to use the new
# interface.
DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
unichrome savage sis

12
configs/freebsd-dri-x86 Normal file
View File

@@ -0,0 +1,12 @@
# -*-makefile-*-
# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
include $(TOP)/configs/freebsd-dri
CONFIG_NAME = freebsd-dri-x86
# Unnecessary on x86, generally.
PIC_FLAGS =
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)

14
configs/hpux10 Normal file
View File

@@ -0,0 +1,14 @@
# Configuration for HPUX v10, shared libs
include $(TOP)/configs/default
CONFIG_NAME = hpux10
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
APP_LIB_DEPS = -$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

16
configs/hpux10-gcc Normal file
View File

@@ -0,0 +1,16 @@
# Configuration for HPUX v10, with gcc
include $(TOP)/configs/default
CONFIG_NAME = hpux10-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE
GLUT_CFLAGS = -fexceptions
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

30
configs/hpux10-static Normal file
View File

@@ -0,0 +1,30 @@
# Configuration for HPUX v10, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux10-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++

26
configs/hpux11-32 Normal file
View File

@@ -0,0 +1,26 @@
# Configuration for HPUX v11
include $(TOP)/configs/default
CONFIG_NAME = hpux11-32
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
MKLIB_OPTIONS =
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

26
configs/hpux11-32-static Normal file
View File

@@ -0,0 +1,26 @@
# Configuration for HPUX v11, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux11-32-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

View File

@@ -0,0 +1,26 @@
# Configuration for HPUX v11, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux11-32-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

27
configs/hpux11-64 Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for HPUX v11, 64-bit
include $(TOP)/configs/default
CONFIG_NAME = hpux11-64
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +z -Ae +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
MKLIB_OPTIONS =
LIBDIR = $(TOP)/lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

27
configs/hpux11-64-static Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for HPUX v11, 64-bit, static libs
include $(TOP)/configs/default
CONFIG_NAME = hpux11-64-static
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
MKLIB_OPTIONS = -static
LIBDIR = $(TOP)/lib64
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies
APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

16
configs/hpux9 Normal file
View File

@@ -0,0 +1,16 @@
# Configuration for HPUX v9, shared libs
include $(TOP)/configs/default
CONFIG_NAME = hpux9
# Compiler and flags
CC = cc
# XXX fix this
CXX = c++
CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
CXXFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm

14
configs/hpux9-gcc Normal file
View File

@@ -0,0 +1,14 @@
# Configuration for HPUX v10, shared libs
include $(TOP)/configs/default
CONFIG_NAME = hpux9-gcc
# Compiler and flags
CC = cc
CXX = aCC
CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

18
configs/irix6-64 Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for IRIX 6.x, make n64 DSOs
include $(TOP)/configs/default
CONFIG_NAME = irix6-64
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM
CXXFLAGS = -64 -O3 -ansi -woff 1174
MKLIB_OPTIONS = -archopt 64
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = $(TOP)/lib64
APP_LIB_DEPS = -L$(LIB_DIR) -64 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm

25
configs/irix6-64-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for IRIX 6.x, make n64 static libs
include $(TOP)/configs/default
CONFIG_NAME = irix6-64-static
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM
CXXFLAGS = -64 -O3 -ansi -woff 1174
MKLIB_OPTIONS = -archopt 64 -static
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = $(TOP)/lib64
APP_LIB_DEPS = -L$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

18
configs/irix6-n32 Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for IRIX 6.x, make n32 DSOs
include $(TOP)/configs/default
CONFIG_NAME = irix6-n32
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM
CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552
MKLIB_OPTIONS = -archopt n32
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = $(TOP)/lib32
APP_LIB_DEPS = -L$(LIB_DIR) -n32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lm

25
configs/irix6-n32-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for IRIX 6.x, make n32 static libs
include $(TOP)/configs/default
CONFIG_NAME = irix6-n32-static
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666
MKLIB_OPTIONS = -archopt n32 -static
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = $(TOP)/lib32
APP_LIB_DEPS = -L$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

19
configs/irix6-o32 Normal file
View File

@@ -0,0 +1,19 @@
# Configuration for IRIX 6.x, make o32 DSOs
include $(TOP)/configs/default
CONFIG_NAME = irix6-o32
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
MKLIB_OPTIONS = -archopt o32
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = $(TOP)/lib32
APP_LIB_DEPS = -L$(LIB_DIR) -32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm

25
configs/irix6-o32-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for IRIX 6.x, make o32 static libs
include $(TOP)/configs/default
CONFIG_NAME = irix6-o32-static
# Compiler and flags
CC = cc
CXX = CC
CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
MKLIB_OPTIONS = -archopt o32 -static
GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
LIB_DIR = $(TOP)/lib32
APP_LIB_DEPS = -L$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

20
configs/linux Normal file
View File

@@ -0,0 +1,20 @@
# Configuration for generic Linux
include $(TOP)/configs/default
CONFIG_NAME = linux
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
# Library/program dependencies
# Need to have -L/usr/X11R6/lib in these:
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11

18
configs/linux-alpha Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for Linux on Alpha
include $(TOP)/configs/default
CONFIG_NAME = linux-alpha
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM
CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE
GLUT_CFLAGS = -fexceptions
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

View File

@@ -0,0 +1,27 @@
# Configuration for Linux on Alpha, static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-alpha-static
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm

20
configs/linux-debug Normal file
View File

@@ -0,0 +1,20 @@
# Configuration for debugging on Linux
include $(TOP)/configs/default
CONFIG_NAME = linux-debug
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG
CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
GLUT_CFLAGS = -fexceptions
# Need to have -L/usr/X11R6/lib in these:
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11

53
configs/linux-dri Normal file
View File

@@ -0,0 +1,53 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/default
CONFIG_NAME = linux-dri
# Compiler and flags
CC = gcc
CXX = g++
MKDEP = /usr/X11R6/bin/makedepend
#MKDEP = gcc -M
#MKDEP_OPTIONS = -MF depend
WARN_FLAGS = -Wall
OPT_FLAGS = -O -g
PIC_FLAGS = -fPIC
DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-D_BSD_SOURCE -D_GNU_SOURCE \
-DDRI_NEW_INTERFACE_ONLY -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1
X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(ASM_FLAGS) -std=c99 $(PIC_FLAGS) -ffast-math \
$(DEFINES)
CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
$(DEFINES)
ASM_SOURCES =
# Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
# Directories
SRC_DIRS = mesa glu glut/glx glw glx/x11
DRIVER_DIRS = dri
PROGRAM_DIRS =
WINDOW_SYSTEM=dri
# ffb and gamma are missing because they have not been converted to use the new
# interface.
DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon s3v \
savage sis tdfx trident unichrome

17
configs/linux-dri-ppc Normal file
View File

@@ -0,0 +1,17 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/linux-dri
CONFIG_NAME = linux-dri-ppc
OPT_FLAGS = -Os -mcpu=603
PIC_FLAGS = -fPIC
ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
ASM_SOURCES = $(PPC_SOURCES)
# Build only the drivers for cards that exist on PowerPC. At some point MGA
# will be added, but not yet.
DRI_DIRS = dri_client mach64 r128 r200 radeon tdfx

12
configs/linux-dri-x86 Normal file
View File

@@ -0,0 +1,12 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/linux-dri
CONFIG_NAME = linux-dri-x86
# Unnecessary on x86, generally.
PIC_FLAGS =
ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
ASM_SOURCES = $(X86_SOURCES)

40
configs/linux-dri-x86-64 Normal file
View File

@@ -0,0 +1,40 @@
# -*-makefile-*-
# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
include $(TOP)/configs/default
CONFIG_NAME = linux-dri-x86-64
# Compiler and flags
CC = gcc
CXX = g++
DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE -D__AMD64__
CFLAGS = -m64 -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math $(DEFINES)
CXXFLAGS = -m64 -Wall -g -ansi -pedantic -fPIC $(DEFINES)
X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
#ASM_SOURCES = $(X86_SOURCES)
LIB_DIR = $(TOP)/lib64
# Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
# Directories
SRC_DIRS = mesa glu glut/glx glw glx/x11
DRIVER_DIRS = dri
PROGRAM_DIRS =
WINDOW_SYSTEM=dri
# ffb, gamma, and sis are missing because they have
# not be converted to use the new interface. Do i810 & i830 really
# need to be included here?
#
DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome savage

20
configs/linux-glide Normal file
View File

@@ -0,0 +1,20 @@
# Configuration for generic Linux with 3Dfx Glide driver
include $(TOP)/configs/default
CONFIG_NAME = linux-glide
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
# Library/program dependencies
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm

21
configs/linux-icc Normal file
View File

@@ -0,0 +1,21 @@
# Configuration for Linux with Intel C compiler
include $(TOP)/configs/default
CONFIG_NAME = linux-icc
# Compiler and flags
CC = icc
CXX = g++
CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -O3
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -arch icc
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
ASM_SOURCES = $(X86_SOURCES) $(X86_API)

29
configs/linux-icc-static Normal file
View File

@@ -0,0 +1,29 @@
# Configuration for Linux with Intel C compiler, static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-icc-static
# Compiler and flags
CC = icc
CXX = g++
CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -O3
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static -arch icc
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
MKLIB_OPTIONS = -arch icc
ASM_SOURCES = $(X86_SOURCES) $(X86_API)

27
configs/linux-osmesa16 Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for 16 bits/channel OSMesa library on Linux
include $(TOP)/configs/default
CONFIG_NAME = linux-osmesa16
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
# Library names
OSMESA_LIB = OSMesa16
OSMESA_LIB_NAME = libOSMesa16.so
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
APP_LIB_DEPS = -lOSMesa16

View File

@@ -0,0 +1,28 @@
# Configuration for 16 bits/channel OSMesa library on Linux
include $(TOP)/configs/default
CONFIG_NAME = linux-osmesa16-static
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
MKLIB_OPTIONS = -static
# Library names
OSMESA_LIB = OSMesa16
OSMESA_LIB_NAME = libOSMesa16.a
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
APP_LIB_DEPS = -lOSMesa16

27
configs/linux-osmesa32 Normal file
View File

@@ -0,0 +1,27 @@
# Configuration for 32 bits/channel OSMesa library on Linux
include $(TOP)/configs/default
CONFIG_NAME = linux-osmesa32
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
# Library names
OSMESA_LIB = OSMesa32
OSMESA_LIB_NAME = libOSMesa32.so
# Directories
SRC_DIRS = mesa glu
DRIVER_DIRS = osmesa
PROGRAM_DIRS =
# Dependencies
OSMESA_LIB_DEPS = -lm -lpthread
APP_LIB_DEPS = -lOSMesa32

18
configs/linux-ppc Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for Linux on PPC
include $(TOP)/configs/default
CONFIG_NAME = linux-ppc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

26
configs/linux-ppc-static Normal file
View File

@@ -0,0 +1,26 @@
# Configuration for Linux on PPC, static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-ppc-static
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
CXXFLAGS = -O3 -mcpu=603 -ansi -pedantic -fPIC -fsigned-char -ffast-math -funroll-loops -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm

33
configs/linux-solo Normal file
View File

@@ -0,0 +1,33 @@
# Configuration for linux-solo: Linux DRI hardware drivers for fbdev
include $(TOP)/configs/default
CONFIG_NAME = linux-solo
# Compiler and flags
CC = gcc
CXX = g++
DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE
CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
ASM_SOURCES = $(X86_SOURCES)
# Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
GL_LIB_DEPS = -lm -lpthread -ldl
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
# Directories
SRC_DIRS = mesa glx/mini glu glut/mini
DRIVER_DIRS = dri
PROGRAM_DIRS = miniglx
#DRI_DIRS = fb ffb gamma sis savage
DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome

29
configs/linux-solo-ia64 Normal file
View File

@@ -0,0 +1,29 @@
# Configuration for linux-solo-ia64: Linux DRI hardware drivers for fbdev
include $(TOP)/configs/default
CONFIG_NAME = linux-solo-ia64
# Compiler and flags
CC = gcc
CXX = g++
DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE
CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC -ffast-math
CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
# Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
GL_LIB_DEPS = -lm -lpthread -ldl
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
# Directories
SRC_DIRS = mesa glx/mini glu glut/mini
DRIVER_DIRS = dri
PROGRAM_DIRS = miniglx
DRI_DIRS = fb mach64 mga r128 r200 radeon sis tdfx unichrome

32
configs/linux-solo-x86 Normal file
View File

@@ -0,0 +1,32 @@
# Configuration for linux-solo: Linux DRI hardware drivers for fbdev
include $(TOP)/configs/default
CONFIG_NAME = linux-solo-x86
# Compiler and flags
CC = gcc
CXX = g++
DEFINES = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS
CFLAGS = $(DEFINES) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math
CXXFLAGS = $(DEFINES) -Wall -O3 -ansi -pedantic -fPIC
ASM_SOURCES = $(X86_SOURCES)
# Library/program dependencies
DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl
GL_LIB_DEPS = -lm -lpthread -ldl
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
# Directories
SRC_DIRS = mesa glx/mini glu glut/mini
DRIVER_DIRS = dri
PROGRAM_DIRS = miniglx
#DRI_DIRS = fb ffb gamma sis savage
DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome

16
configs/linux-sparc Normal file
View File

@@ -0,0 +1,16 @@
# Configuration for Linux on Sparc
include $(TOP)/configs/default
CONFIG_NAME = linux-sparc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
CXXFLAGS = -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11

17
configs/linux-sparc5 Normal file
View File

@@ -0,0 +1,17 @@
# Configuration for Linux on Sparc5
include $(TOP)/configs/default
CONFIG_NAME = linux-sparc5
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
CXXFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11

30
configs/linux-static Normal file
View File

@@ -0,0 +1,30 @@
# Configuration for generic Linux, making static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-static
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++

22
configs/linux-tcc Normal file
View File

@@ -0,0 +1,22 @@
# Configuration for debugging on Linux
include $(TOP)/configs/default
CONFIG_NAME = linux-tcc
# Compiler and flags
CC = gcc
CXX = g++
TCC_DIR=/home/progs/tcc-0.9.20
CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)
CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
GLUT_CFLAGS = -fexceptions
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

17
configs/linux-ultrasparc Normal file
View File

@@ -0,0 +1,17 @@
# Configuration for Linux on UltraSparc
include $(TOP)/configs/default
CONFIG_NAME = linux-ultrasparc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
CXXFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR)-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

24
configs/linux-x86 Normal file
View File

@@ -0,0 +1,24 @@
# Configuration for Linux with x86 optimizations
include $(TOP)/configs/default
CONFIG_NAME = linux-x86
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
# Library/program dependencies
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

28
configs/linux-x86-64 Normal file
View File

@@ -0,0 +1,28 @@
# Configuration for Linux for 64-bit X86 (Opteron)
include $(TOP)/configs/default
CONFIG_NAME = linux-x86-64
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include
CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
GLUT_CFLAGS = -fexceptions
#ASM_SOURCES = $(X86_SOURCES)
LIB_DIR = $(TOP)/lib64
# Library/program dependencies
GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib64 -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

View File

@@ -0,0 +1,40 @@
# Configuration for Linux for 64-bit X86 (Opteron), static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-x86-64-static
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -D__AMD64__ -I/usr/X11R6/include
CXXFLAGS = -m64 -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
#ASM_SOURCES = $(X86_SOURCES)
LIB_DIR = $(TOP)/lib64
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib64 -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++

10
configs/linux-x86-debug Normal file
View File

@@ -0,0 +1,10 @@
# Configuration for Linux with x86 code, but no gcc optimizations and
# debugging enabled.
include $(TOP)/configs/linux-x86
CONFIG_NAME = linux-x86-debug
CFLAGS = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE

24
configs/linux-x86-glide Normal file
View File

@@ -0,0 +1,24 @@
# Configuration for Linux with 3Dfx Glide driver and x86 optimizations
include $(TOP)/configs/default
CONFIG_NAME = linux-x86-glide
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
# Library/program dependencies
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm

37
configs/linux-x86-static Normal file
View File

@@ -0,0 +1,37 @@
# Configuration for Linux with x86 optimizations, static libs
include $(TOP)/configs/default
CONFIG_NAME = linux-x86-static
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
CXXFLAGS = -Wall -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
ASM_SOURCES = $(X86_SOURCES) $(X86_API)
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++

14
configs/netbsd Normal file
View File

@@ -0,0 +1,14 @@
# Configuration for NetBSD
include $(TOP)/configs/default
CONFIG_NAME = netbsd
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100
CXXFLAGS = -O2 -fPIC
GLUT_CFLAGS = -fexceptions
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm

18
configs/openbsd Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for OpenBSD
include $(TOP)/configs/default
CONFIG_NAME = openbsd
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100
GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm
OSMESA_LIB_DEPS = -lm
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

16
configs/osf1 Normal file
View File

@@ -0,0 +1,16 @@
# Configuration for OSF/1
include $(TOP)/configs/default
CONFIG_NAME = osf1
# Compiler and flags
CC = cc
CXX = cxx
CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM
CXXFLAGS = -O2 -std ansi -ieee
GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(LIB_DIR) -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm

18
configs/solaris-x86 Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for Solaris on x86
include $(TOP)/configs/default
CONFIG_NAME = solaris-x86
# Compiler and flags
CC = cc
CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM
MKLIB_OPTIONS = -static
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

24
configs/solaris-x86-gcc Normal file
View File

@@ -0,0 +1,24 @@
# Configuration for Solaris on x86 with gcc, static libs
include $(TOP)/configs/default
CONFIG_NAME = solaris-x86-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM
CXXFLAGS = -O3 -m486 -fPIC
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a

12
configs/sunos4 Normal file
View File

@@ -0,0 +1,12 @@
# Configuration for SunOS 4, shared libs
include $(TOP)/configs/default
CONFIG_NAME = sunos4
# Compiler and flags
CC = acc
CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm

15
configs/sunos4-gcc Normal file
View File

@@ -0,0 +1,15 @@
# Configuration for SunOS 4, with gcc, shared libs
include $(TOP)/configs/default
CONFIG_NAME = sunos4-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4
GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm

25
configs/sunos4-static Normal file
View File

@@ -0,0 +1,25 @@
# Configuration for SunOS 4, static libs
include $(TOP)/configs/default
CONFIG_NAME = sunos4-static
# Compiler and flags
CC = acc
CFLAGS = -O -DUSE_XSHM -DSUNOS4
MKLIB_OPTIONS = -static
# Library names (actual file names)
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
# Library/program dependencies (static libs don't have dependencies)
GL_LIB_DEPS =
OSMESA_LIB_DEPS =
GLU_LIB_DEPS =
GLUT_LIB_DEPS =
GLW_LIB_DEPS =
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm

18
configs/sunos5 Normal file
View File

@@ -0,0 +1,18 @@
# Configuration for SunOS 5
include $(TOP)/configs/default
CONFIG_NAME = sunos5
# Compiler and flags
CC = cc
CXX = c++
CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM
CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include
GLUT_CFLAGS = -DSOLARIS_2_4_BUG
GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

21
configs/sunos5-gcc Normal file
View File

@@ -0,0 +1,21 @@
# Configuration for SunOS 5, with gcc
include $(TOP)/configs/default
CONFIG_NAME = sunos5-gcc
ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API)
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_XSHM -DUSE_SPARC_ASM
CXXFLAGS = -O3 -I/usr/openwin/include -fPIC -fomit-frame-pointer -D_REENTRANT -DUSE_SPARC_ASM
GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm

19
configs/sunos5-smp Normal file
View File

@@ -0,0 +1,19 @@
# Configuration for SunOS 5, SMP systems
include $(TOP)/configs/default
CONFIG_NAME = sunos5-smp
# Compiler and flags
CC = cc
CXX = c++
CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG
CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include
GLUT_CFLAGS = -DSOLARIS_2_4_BUG
GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun

21
configs/ultrix-gcc Normal file
View File

@@ -0,0 +1,21 @@
# Configuration for Ultrix, with gcc
include $(TOP)/configs/default
CONFIG_NAME = ultrix-gcc
# Compiler and flags
CC = gcc
CXX = g++
CFLAGS = -pedantic -O2
CXXFLAGS = -pedantic -O2
GLUT_CFLAGS = -fexceptions
MKLIB_OPTIONS = -static
GL_LIB_NAME = libGL.a
GLU_LIB_NAME = libGLU.a
GLUT_LIB_NAME = libglut.a
GLW_LIB_NAME = libGLw.a
OSMESA_LIB_NAME = libOSMesa.a
APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXmu -lX11 -lXi -lm

View File

@@ -17,5 +17,4 @@ all :
$(MMS)$(MMSQUALIFIERS)
set default [-.xdemos]
$(MMS)$(MMSQUALIFIERS)
set default [-.tests]
$(MMS)$(MMSQUALIFIERS)
if f$search("[-]test.DIR") .nes. "" then pipe set default [-.test] ; $(MMS)$(MMSQUALIFIERS)

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul, Tungsten Graphics, Inc. (brian 'at' tungstengraphics.com)
Brian Paul, Tungsten Graphics, Inc. (brian.paul 'at' tungstengraphics.com)
Keith Whitwell, Tungsten Graphics, Inc. (keith 'at' tungstengraphics.com)
Status
@@ -48,7 +48,7 @@ Issues
New Procedures and Functions
GLuint glXGetAGPOffsetMESA( const GLvoid *pointer )
unsigned int glXGetAGPOffsetMESA( const void *pointer )
New Tokens
@@ -92,3 +92,4 @@ Revision History
20 September 2002 - Initial draft
2 October 2002 - finished GLX chapter 3 additions
27 July 2004 - use unsigned int instead of GLuint, void instead of GLvoid

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul (brian 'at' mesa3d.org)
Brian Paul (brian.paul 'at' tungstengraphics.com)
Status

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul, Tungsten Graphics, Inc. (brian 'at' tungstengraphics.com)
Brian Paul, Tungsten Graphics, Inc. (brian.paul 'at' tungstengraphics.com)
Keith Whitwell, Tungsten Graphics, Inc. (keith 'at' tungstengraphics.com)
Status

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul (brian 'at' mesa3d.org)
Brian Paul (brian.paul 'at' tungstengraphics.com)
Status

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul (brian @ tungstengraphics.com)
Brian Paul (brian.paul 'at' tungstengraphics.com)
Status
@@ -18,7 +18,7 @@ Version
Last Modified Date: July 20, 2003
Author Revision: 1.0
$Date: 2003/09/23 14:46:11 $ $Revision: 1.3 $
$Date: 2004/03/25 01:42:41 $ $Revision: 1.4 $
Number

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul (brian 'at' mesa3d.org)
Brian Paul (brian.paul 'at' tungstengraphics.com)
Status

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul, brianp 'at' mesa3d.org
Brian Paul (brian.paul 'at' tungstengraphics.com)
Status
@@ -16,7 +16,7 @@ Status
Version
$Id: MESA_resize_buffers.spec,v 1.2 2000/04/04 23:29:32 brianp Exp $
$Id: MESA_resize_buffers.spec,v 1.3 2004/03/25 01:42:42 brianp Exp $
Number

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul (brian 'at' mesa3d.org)
Brian Paul (brian.paul 'at' tungstengraphics.com)
Status

View File

@@ -4,7 +4,7 @@ Name
Name Strings
GL_MESA_TRACE
GL_MESA_trace
Contact
@@ -17,7 +17,7 @@ Status
Version
$Id: MESA_trace.spec,v 1.3 2003/09/19 14:58:21 brianp Exp $
$Id: MESA_trace.spec,v 1.4 2004/03/25 01:42:42 brianp Exp $
Number

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul, brianp 'at' mesa3d.org
Brian Paul, brian.paul 'at' tungstengraphics.com
Status
@@ -16,7 +16,7 @@ Status
Version
$Id: MESA_window_pos.spec,v 1.3 2000/04/04 23:29:32 brianp Exp $
$Id: MESA_window_pos.spec,v 1.4 2004/03/25 01:42:42 brianp Exp $
Number

View File

@@ -8,7 +8,7 @@ Name Strings
Contact
Brian Paul, Tungsten Graphics, Inc. (brian 'at' tungstengraphics.com)
Brian Paul, Tungsten Graphics, Inc. (brian.paul 'at' tungstengraphics.com)
Keith Whitwell, Tungsten Graphics, Inc. (keith 'at' tungstengraphics.com)
Status
@@ -75,14 +75,14 @@ Additions to Chapter 2 of the OpenGL 1.4 Specification (OpenGL Operation)
Additions to Chapter 3 of the OpenGL 1.4 Specification (Rasterization)
In section 3.6.4, Rasterization of Pixel Rectangles, on page 102,
In section 3.6.4, Rasterization of Pixel Rectangles, on page 101,
add the following to Table 3.8 (Packed pixel formats):
type Parameter GL Data Number of Matching
Token Name Type Components Pixel Formats
-------------- ------- ---------- -------------
UNSIGNED_SHORT_8_8_MESA ushort 3 YCBCR_422_MESA
UNSIGNED_SHORT_8_8_REV_MESA ushort 3 YCBCR_422_MESA
UNSIGNED_SHORT_8_8_MESA ushort 2 YCBCR_MESA
UNSIGNED_SHORT_8_8_REV_MESA ushort 2 YCBCR_MESA
In section 3.6.4, Rasterization of Pixel Rectangles, on page 102,
@@ -103,13 +103,13 @@ Additions to Chapter 3 of the OpenGL 1.4 Specification (Rasterization)
+-------------------------------+-------------------------------+
In section 3.6.4, Rasterization of Pixel Rectangles, on page 102,
In section 3.6.4, Rasterization of Pixel Rectangles, on page 104,
add the following to Table 3.12 (Packed pixel fiedl assignments):
First Second Third Fourth
Format Element Element Element Element
------ ------- ------- ------- -------
YCBCR_422_MESA luminance chroma
YCBCR_MESA luminance chroma
In section 3.8.1, Texture Image Specification, on page 125, add
@@ -201,3 +201,4 @@ Revision History
3 September 2003 - further clarify when YCbCr->RGB conversion takes place
19 September 2003 - a few more updates prior to submitting to extension
registry.
3 April 2004 - fix assorted inaccuracies

View File

@@ -3,6 +3,223 @@
Requirements:
-------------
A Voodoo-based videocard/accelerator
DOS (with DJGPP), Windows9x/2k (with MinGW), Linux
Glide3x library for your OS
http://sourceforge.net/projects/glide/
How to compile:
---------------
DJGPP:
Place the Glide3 SDK in the top Mesa directory:
$(MESA)/glide3/include/
3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
$(MESA)/glide3/lib/
libgld3x.a, libgld3i.a, glide3x.dxe
Type:
make -f Makefile.DJ X86=1 FX=1
Look into the makefile for further information.
MinGW:
Place the Glide3 SDK in the top Mesa directory:
$(MESA)/glide3/include/
3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
$(MESA)/glide3/lib/
libglide3x.a, glide3x.dll
Type:
make -f Makefile.mgw X86=1 FX=1
Look into the makefile for further information.
Linux:
Place the Glide3 SDK in /usr/local/glide
/usr/local/glide/include/
3dfx.h, g3ext.h, glide.h, glidesys.h, glideutl.h, sst1vid.h
/usr/local/glide/lib/
libglide3x.a, libglide3x.so
Type:
make linux-glide
or
make linux-x86-glide
Compilation defines:
--------------------
FX_DEBUG
enable driver debug code
FX_TRAP_GLIDE
enable Glide trace code
FX_PACKEDCOLOR
use packed color in vertex structure
FX_TC_NAPALM
map GL_COMPRESSED_RGB[A] to FXT1. Works with VSA100-based cards only.
FX_COMPRESS_S3TC_AS_FXT1_HACK
map S3TC to FXT1
FX_RESCALE_BIG_TEXURES_HACK
fake textures larger than HW can support
(see MESA_FX_MAXLOD environment variable)
Environment variables:
----------------------
The following environment variables affect MesaFX. Those that affect Glide
only, are beyond the scope of this section. Entries that don't have a "Value"
field, can have any value whatsoever
ex: set MESA_FX_IGNORE_CMBEXT=y
"Note" (*) means that the environment variable affects Glide, too; also, if
the var is not found in the environment, it is searched in windoze registry.
"Note" (!) means that the environment variable is not working as expected;
may have undefined effects, might have effects only at Glide level or might
not have any effect whatsoever. Caveat emptor! Those are to be revised soon.
It is recommended to leave the envvars alone, so that Mesa/Glide will run with
default values. Use them only when you experience crashes or strange behavior.
FX_GLIDE_NUM_TMU
OS: all
HW: dual-TMU cards (Voodoo2, Avenger, Napalm)
Desc: force single-TMU
Note: (*)
Value: "1"
FX_GLIDE_SWAPPENDINGCOUNT
OS: all
HW: all
Desc: max # of buffers allowed to build up
Note: (*) (!)
Value: "0", "1", "2", "3", "4", "5" or "6"
FX_GLIDE_SWAPINTERVAL
OS: all
HW: all
Desc: number of vertical retraces to wait before swapping
Note: (*) (!) works only at Glide-level?
SSTH3_SLI_AA_CONFIGURATION
OS: all
HW: VSA100-based cards
Desc: SLI/AA setup
Note: (*) (!) works only at Glide-level?
Value:
1, 2, 4 chip cards
"0" - SLI & AA disable
"1" - SLI disabled, 2 sample AA enabled
2, 4 chip cards
"2" - 2-way SLI enabled, AA disabled
"3" - 2-way SLI enabled, 2 sample AA enabled
"4" - SLI disabled, 4 sample AA enabled
4 chip cards
"5" - 4-way SLI enabled, AA disabled
"6" - 4-way SLI enabled, 2 sample AA enabled
"7" - 2-way SLI enabled, 4 sample AA enabled
"8" - SLI disabled, 8 sample AA enabled
SST_DUALHEAD
OS: win32
HW: ?
Desc: ?
Note: (!) disabled?
MESA_FX_NO_SIGNALS
OS: linux
HW: all
Desc: avoid installing signals
Note: (!) untested!
MESA_FX_INFO
OS: all
HW: all
Desc: verbose to stderr
Value: any; special value "r" to redirect stderr to MESA.LOG
MESA_FX_NOSNAP
OS: all
HW: Voodoo1, Rush, Banshee
Desc: do not snap vertices inside Mesa
Note: to be used with Glide3x that snaps vertices internally
MESA_FX_POINTCAST
OS: all
HW: dual-TMU cards (some Voodoo1, Voodoo2, Avenger, Napalm)
Desc: try to use pointcast palette
Note: may give adverse effects on UMA cards (Avenger, Napalm)
MESA_FX_IGNORE_PALEXT
OS: all
HW: all
Desc: disable 6666 palette
MESA_FX_IGNORE_PIXEXT
OS: all
HW: Napalm
Desc: force 565 16bpp mode (traditional Voodoo, no 32/15bpp)
MESA_FX_IGNORE_TEXFMT
OS: all
HW: Napalm
Desc: disable 32bit textures
MESA_FX_IGNORE_CMBEXT
OS: all
HW: Napalm
Desc: disable Napalm combiners (color/alpha/texture)
Note: this option allows dual-TMU cards perform single-pass
trilinear, but some advanced (multi)texturing modes
won't work (GL_EXT_texture_env_combine)
MESA_FX_IGNORE_MIREXT
OS: all
HW: all
Desc: disable mirror extension
MESA_FX_IGNORE_TEXUMA
OS: all
HW: all
Desc: disable UMA
MESA_FX_IGNORE_TEXUS2
OS: all
HW: all
Desc: disable Texus2
MESA_FX_MAXLOD
OS: all
HW: non VSA-100 cards
Desc: enable large texture support using SW rescaling
Value:
"9" - 512x512 textures
"10" - 1024x1024 textures
"11" - 2048x2048 textures
MESA_FX_ALLOW_VP
OS: all
HW: all
Desc: allow vertex program extensions
MESA_GLX_FX
OS: linux
HW: Voodoo1, Rush, Voodoo2
Desc: display mode
Note: (!) experimental
Value:
"w" - windowed mode
"f" - fullscreen mode
"d" - disable glide driver
OS: win32
HW: Rush, Banshee, Avenger, Napalm
Desc: display mode
Note: (!) experimental
Value:
"w" - windowed mode
Contact:
--------
Daniel Borca <dborca 'at' users 'dot' sourceforge 'dot' net>
Hiroshi Morii <koolsmoky 'at' users 'dot' sourceforge 'dot' net>
WARNING! The info below this line is outdated (yet some of it useful). WARNING!
*******************************************************************************
Info for Mesa 4.1
-----------------

View File

@@ -5,10 +5,11 @@
* Introduction
Mesa 4.1 features a driver for the BeOS. The driver implements
a clone of the BGLView class. This class, derived from BView, allows
OpenGL rendering into a BeOS window.
The 4.1 BeOS driver is an update of Brian Paul's BeOS driver released in Mesa 3.1.
Brian Paul added in Mesa 3.1 a driver for BeOS R4.5 operating system.
This driver implements a clone of the BGLView class. This class,
derived from BView, allows OpenGL rendering into any BeOS window. His
driver was updated in Mesa 4.1 and again in version 6.1 by Philippe
Houdoin, who's maintaining this driver since.
Any application which uses the BGLView should be able to use Mesa
instead of Be's OpenGL without changing any code.
@@ -18,51 +19,70 @@ SGI sample implementation, it's pretty slow. You'll see that Mesa
is considerably faster.
* Source Code
The source code for the driver is in Mesa-4.1/src/BeOS/ directory.
The source code for the driver is in src/mesa/drivers/beos/ directory.
It's not 100% finished at this time but many GLUT-based demos are
working. No optimizations have been made at this time.
* Compiling
Requirements:
- gcc version 2.95.3 for BeOS
You can find it here: http://www.bebits.com/app/2157
Since Mesa 6.x, it can be build under BeOS with both the R5 builtin gcc version
or more recent gcc versions available for BeOS, like this gcc version 2.95.3 for BeOS
you can find at http://www.bebits.com/app/2157.
Anyway, keep in mind that to take full advantage of Mesa x86 optimizations, you better
want to use gcc 2.95.3 or sooner versions...
To build Mesa-powered BeOS libGL.so version, open an Terminal window,
move to Mesa root folder and type this command:
$ make beos
Note that the "beos" argument is only needed the first time to setup build config.
Next times, typing "make" will be enough.
Move to the Mesa-4.x src sub-directory and then type "make -f Makefile.BeOS-R5".
When it finishes the Mesa based libGL.so library for
BeOS will be in the Mesa-4.x/src/obj.{x86|ppc}/ directory.
BeOS will be in the lib/ directory, along libglut.so library.
Several demo/test programs should have been build too under progs/* folders.
If it stop when building one of the progs/* programs, you may want to ignore it
and force make to move on next target by adding the -k make option:
$ cd progs
$ make -k
To install it as Be's default libGL.so replacement, put it in your
/boot/home/config/lib/ directory. All your GL/GLUTapps will use
/boot/home/config/lib/ directory. All your GL/GLUT apps will use
the Mesa based then.
By default, it build a non-debug version library.
The x86 (MMX, SSE and 3DNOW) optimizations are also supported for x86 target.
Sorry, Mesa don't have ppc (Altivec) optimizations yet.
For PowerPC BeOS flavor, sorry, Mesa don't have ppc (Altivec) optimizations
yet.
To build a DEBUG version, type instead this :
$ DEBUG=1 make
* Example Programs
Look in the Mesa-4.x/BeOS/ directory for one or two BGLView demo
programs. They should have been compiled along with the Mesa
library.
Look under progs/beos/ for some BGLView-based programs.
You should find under progs/samples and progs/redbook directories GLUT-based programs too.
They all should have been compiled along with the Mesa library.
* GLUT
A beta version of GLUT 3.7 port for BeOS can be found at
A beta version of GLUT 3.7 port for BeOS, made by Jake Hamby, can be found at
http://anobject.com/jehamby/Code/Glut-3.7-x86.zip.
This is the version currently included in Mesa source code, and
build in lib/libglut.so.
There's is a 2.5 version in src-glut.beos/, too.
The original distribution can be obtained from
http://home.beoscentral.com/jehamby/Glut-3.5-x86.zip
A previous 3.5 version of this GLUT BeOS port used to be available at
http://home.beoscentral.com/jehamby/Glut-3.5-x86.zip.
They are special version of GLUT adapted for the BeOS. I don't
They're special versions of GLUT for the BeOS platform. I don't
believe Mark Kilgard's normal GLUT distribution includes BeOS
support.
@@ -78,37 +98,40 @@ that you're actually using Mesa (with glGetString) so you don't
cause a fatal error when running with Be's OpenGL.
* Work Left To Do
BDirectWindow single buffering support is not implemented yet.
- BDirectWindow single buffering support is not implemented yet.
- Color index mode is not implemented yet.
- Reading pixels from the front buffer not implemented yet.
- There is also a BGLScreen class in BeOS for full-screen OpenGL rendering.
This should also be implemented for Mesa.
- Multiple renderers add-ons support, first step toward hardware acceleration
support.
Color index mode is not implemented yet.
* Other contributors to this BeOS port
Reading pixels from the front buffer not implemented yet.
There is also a BGLScreen class in BeOS for full-screen OpenGL
rendering. This should also be implemented for Mesa.
Jake Hamby jhamby <at> anobject <dot> com
Marcin Konicki ahwayakchih <at> neoni <dot> net
Francois Revol revol <at> free <dot> fr
Nathan Whitehorn nathanw <at> uchicago <dot> edu
* Old BeOS Driver
* Older BeOS Driver
Mesa 2.6 had an earlier BeOS driver. It was based on Mesa's Off-screen
rendering interface, not BGLView. If you're interested in the older
driver you should get Mesa 2.6.
* BeOS and Glide
Mesa 3.0 supported the 3Dfx/Glide library on Beos. Download Mesa 3.0
if interested. Ideally, the 3Dfx/Glide support should be updated to
work with the new Mesa 3.1 BGLView implementation.
The Glide library hasn't been updated for BeOS R4, to my knowledge, as
of February, 1999.
The Glide library hasn't been updated for BeOS R4 and newer, to my knowledge,
as of February, 1999.
----------------------------------------------------------------------
$Id: README.BEOS,v 1.7 2002/09/19 16:19:44 brianp Exp $
$Id: README.BEOS,v 1.12 2004/10/13 00:35:55 phoudoin Exp $

256
docs/README.CYGWIN Normal file
View File

@@ -0,0 +1,256 @@
Mesa Cygwin/X11 Information
WARNING
=======
If you installed X11 (packages xorg-x11-devel and xorg-x11-bin-dlls ) with the
latest setup.exe from Cygwin the GL (Mesa) libraries and include are already
installed in /usr/X11R6.
The following will explain how to "replace" them.
Installation
============
How to compile Mesa on Cygwin/X11 systems:
1. Shared libs:
type 'make cygwin-sl'.
When finished, the Mesa DLL will be in the Mesa-x.y/lib/ and
Mesa-x.y/bin directories.
2. Static libs:
type 'make cygwin-static'.
When finished, the Mesa libraries will be in the Mesa-x.y/lib/ directory.
Header and library files:
After you've compiled Mesa and tried the demos I recommend the following
procedure for "installing" Mesa.
Copy the Mesa include/GL directory to /usr/X11R6/include:
cp -a include/GL /usr/X11R6/include
Copy the Mesa library files to /usr/X11R6/lib:
cp -a lib/* /usr/X11R6ocal/lib
Copy the Mesa bin files (used by the DLL stuff) to /usr/X11R6/bin:
cp -a lib/cyg* /usr/X11R6/bin
Xt/Motif widgets:
If you want to use Mesa or OpenGL in your Xt/Motif program you can build
the widgets found in either the widgets-mesa or widgets-sgi directories.
The former were written for Mesa and the later are the original SGI
widgets. Look in those directories for more information.
For the Motif widgets you must have downloaded the lesstif package.
Using the library
=================
Configuration options:
The file src/mesa/main/config.h has many parameters which you can adjust
such as maximum number of lights, clipping planes, maximum texture size,
etc. In particular, you may want to change DEPTH_BITS from 16 to 32
if a 16-bit depth buffer isn't precise enough for your application.
Shared libraries:
If you compile shared libraries (Win32 DLLS) you may have to set an
environment variable to specify where the Mesa libraries are located.
Set the PATH variable to include /your-dir/Mesa-2.6/bin.
Otherwise, when you try to run a demo it may fail with a message saying
that one or more DLL couldn't be found.
Xt/Motif Widgets:
Two versions of the Xt/Motif OpenGL drawing area widgets are included:
widgets-sgi/ SGI's stock widgets
widgets-mesa/ Mesa-tuned widgets
Look in those directories for details
Togl:
Togl is an OpenGL/Mesa widget for Tcl/Tk.
See http://togl.sourceforge.net for more information.
X Display Modes:
Mesa supports RGB(A) rendering into almost any X visual type and depth.
The glXChooseVisual function tries its best to pick an appropriate visual
for the given attribute list. However, if this doesn't suit your needs
you can force Mesa to use any X visual you want (any supported by your
X server that is) by setting the MESA_RGB_VISUAL and MESA_CI_VISUAL
environment variables. When an RGB visual is requested, glXChooseVisual
will first look if the MESA_RGB_VISUAL variable is defined. If so, it
will try to use the specified visual. Similarly, when a color index
visual is requested, glXChooseVisual will look for the MESA_CI_VISUAL
variable.
The format of accepted values is: <visual-class> <depth>
Here are some examples:
using the C-shell:
% setenv MESA_RGB_VISUAL "TrueColor 8" // 8-bit TrueColor
% setenv MESA_CI_VISUAL "PseudoColor 12" // 12-bit PseudoColor
% setenv MESA_RGB_VISUAL "PseudoColor 8" // 8-bit PseudoColor
using the KornShell:
$ export MESA_RGB_VISUAL="TrueColor 8"
$ export MESA_CI_VISUAL="PseudoColor 12"
$ export MESA_RGB_VISUAL="PseudoColor 8"
Double buffering:
Mesa can use either an X Pixmap or XImage as the backbuffer when in
double buffer mode. Using GLX, the default is to use an XImage. The
MESA_BACK_BUFFER environment variable can override this. The valid
values for MESA_BACK_BUFFER are: Pixmap and XImage (only the first
letter is checked, case doesn't matter).
A pixmap is faster when drawing simple lines and polygons while an
XImage is faster when Mesa has to do pixel-by-pixel rendering. If you
need depth buffering the XImage will almost surely be faster. Exper-
iment with the MESA_BACK_BUFFER variable to see which is faster for
your application.
Colormaps:
When using Mesa directly or with GLX, it's up to the application writer
to create a window with an appropriate colormap. The aux, tk, and GLUT
toolkits try to minimize colormap "flashing" by sharing colormaps when
possible. Specifically, if the visual and depth of the window matches
that of the root window, the root window's colormap will be shared by
the Mesa window. Otherwise, a new, private colormap will be allocated.
When sharing the root colormap, Mesa may be unable to allocate the colors
it needs, resulting in poor color quality. This can happen when a
large number of colorcells in the root colormap are already allocated.
To prevent colormap sharing in aux, tk and GLUT, define the environment
variable MESA_PRIVATE_CMAP. The value isn't significant.
Gamma correction:
To compensate for the nonlinear relationship between pixel values
and displayed intensities, there is a gamma correction feature in
Mesa. Some systems, such as Silicon Graphics, support gamma
correction in hardware (man gamma) so you won't need to use Mesa's
gamma facility. Other systems, however, may need gamma adjustment
to produce images which look correct. If in the past you thought
Mesa's images were too dim, read on.
Gamma correction is controlled with the MESA_GAMMA environment
variable. Its value is of the form "Gr Gg Gb" or just "G" where
Gr is the red gamma value, Gg is the green gamma value, Gb is the
blue gamma value and G is one gamma value to use for all three
channels. Each value is a positive real number typically in the
range 1.0 to 2.5. The defaults are all 1.0, effectively disabling
gamma correction. Examples using csh:
% setenv MESA_GAMMA "2.3 2.2 2.4" // separate R,G,B values
% setenv MESA_GAMMA "2.0" // same gamma for R,G,B
The demos/gamma.c program may help you to determine reasonable gamma
value for your display. With correct gamma values, the color intensities
displayed in the top row (drawn by dithering) should nearly match those
in the bottom row (drawn as grays).
Alex De Bruyn reports that gamma values of 1.6, 1.6 and 1.9 work well
on HP displays using the HP-ColorRecovery technology.
Mesa implements gamma correction with a lookup table which translates
a "linear" pixel value to a gamma-corrected pixel value. There is a
small performance penalty. Gamma correction only works in RGB mode.
Also be aware that pixel values read back from the frame buffer will
not be "un-corrected" so glReadPixels may not return the same data
drawn with glDrawPixels.
For more information about gamma correction see:
http://www.inforamp.net/~poynton/notes/colour_and_gamma/GammaFAQ.html
Overlay Planes
Overlay planes in the frame buffer are supported by Mesa but require
hardware and X server support. To determine if your X server has
overlay support you can test for the SERVER_OVERLAY_VISUALS property:
xprop -root | grep SERVER_OVERLAY_VISUALS
HPCR glClear(GL_COLOR_BUFFER_BIT) dithering
If you set the MESA_HPCR_CLEAR environment variable then dithering
will be used when clearing the color buffer. This is only applicable
to HP systems with the HPCR (Color Recovery) system.
Extensions
==========
There are three Mesa-specific GLX extensions at this time.
GLX_MESA_pixmap_colormap
This extension adds the GLX function:
GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual,
Pixmap pixmap, Colormap cmap )
It is an alternative to the standard glXCreateGLXPixmap() function.
Since Mesa supports RGB rendering into any X visual, not just True-
Color or DirectColor, Mesa needs colormap information to convert RGB
values into pixel values. An X window carries this information but a
pixmap does not. This function associates a colormap to a GLX pixmap.
See the xdemos/glxpixmap.c file for an example of how to use this
extension.
GLX_MESA_release_buffers
Mesa associates a set of ancillary (depth, accumulation, stencil and
alpha) buffers with each X window it draws into. These ancillary
buffers are allocated for each X window the first time the X window
is passed to glXMakeCurrent(). Mesa, however, can't detect when an
X window has been destroyed in order to free the ancillary buffers.
The best it can do is to check for recently destroyed windows whenever
the client calls the glXCreateContext() or glXDestroyContext()
functions. This may not be sufficient in all situations though.
The GLX_MESA_release_buffers extension allows a client to explicitly
deallocate the ancillary buffers by calling glxReleaseBuffersMESA()
just before an X window is destroyed. For example:
#ifdef GLX_MESA_release_buffers
glXReleaseBuffersMESA( dpy, window );
#endif
XDestroyWindow( dpy, window );
This extension is new in Mesa 2.0.
GLX_MESA_copy_sub_buffer
This extension adds the glXCopySubBufferMESA() function. It works
like glXSwapBuffers() but only copies a sub-region of the window
instead of the whole window.
This extension is new in Mesa version 2.6
Summary of X-related environment variables:
MESA_RGB_VISUAL - specifies the X visual and depth for RGB mode (X only)
MESA_CI_VISUAL - specifies the X visual and depth for CI mode (X only)
MESA_BACK_BUFFER - specifies how to implement the back color buffer (X only)
MESA_PRIVATE_CMAP - force aux/tk libraries to use private colormaps (X only)
MESA_GAMMA - gamma correction coefficients (X only)
----------------------------------------------------------------------
README.CYGWIN - lassauge April 2004 - based on README.X11

View File

@@ -1,4 +1,4 @@
Mesa 5.1 DOS/DJGPP Port v1.4
Mesa 6.3 DOS/DJGPP Port v1.7
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -6,7 +6,7 @@
Description:
~~~~~~~~~~~~
Well, guess what... this is the DOS port of Mesa 5.1, for DJGPP fans... Whoa!
Well, guess what... this is the DOS port of Mesa 6.3, for DJGPP fans... Whoa!
The driver has its origins in ddsample.c, written by Brian Paul and found by me
in Mesa 3.4.2.
@@ -42,18 +42,7 @@ Available options:
As a consequence, you'll need the DJGPP Glide3
library to build any application.
default = no
MATROX=1 build for Matrox Millennium I (MGA2064W) cards.
This is experimental and not intensively tested.
default = no
HAVE_X86=1 optimize for i386.
default = no
HAVE_MMX=1 allow MMX specializations, provided your assembler
supports MMX instruction set. However, the true CPU
capabilities are checked at run-time to avoid lockups.
default = no
HAVE_SSE=1 (see HAVE_MMX)
default = no
HAVE_3DNOW=1 (see HAVE_MMX)
X86=1 optimize for x86 (if possible, use MMX, SSE, 3DNow).
default = no
Targets:
@@ -68,9 +57,9 @@ Available options:
Tested on:
CPU: AMD Athlon XP 1800+
Mainboard: EP-8KTA3 w/ 128 MB SDRAM
Video card: Voodoo5 5500 AGP w/ 64 MB SDRAM
DJGPP: djdev 2.04 + gcc v3.2.2 + make v3.80
Mainboard: GA-7VTXE w/ 512 MB DDRAM
Video card: Voodoo5 6000 AGP w/ 128 MB SDRAM
DJGPP: djdev 2.04 + gcc v3.4.3 + make v3.80
OS: DOS and Win98SE
@@ -102,23 +91,61 @@ FAQ:
2. Using Mesa for DJGPP
Q) Every test I tried crashes badly.
A) If you have compiled with SSE and you're running under plain DOS, you
have to disable SSE at run-time. See environment variables below.
Q) DMesa is so SLOOOW! The Win32 OpenGL performs so much better...
A) Is that a question? If you have a 3dfx Voodoo Banshee or higher card,
you're lucky (check http://sourceforge.net/projects/glide for the DJGPP
port). If you have a Matrox Millennium I card, you just MIGHT be lucky...
A) Is that a question? If you have a 3dfx Voodoo (any model), you're
lucky (check http://sourceforge.net/projects/glide for the DJGPP port).
If you haven't, sorry; everything is done in software. Suggestions?
Q) I tried to set refresh rate w/ DMesa, but without success.
A) Refresh rate control works only for VESA 3.0. If you were compiling for
Glide, see Glide info. If not, sorry!
A) Refresh rate control works only for VESA 3.0 and the 3dfx driver (in
which case FX_GLIDE_REFRESH will be overwritten if it is defined and
is not 0).
Q) I made a simple application and it does nothing. It exits right away. Not
even a blank screen.
A) The pure software drivers (VESA/VGA) support only double-buffered modes.
A) Pure software drivers (VESA/VGA/NUL) support only double-buffered modes.
A) Another weird "feature" is that buffer width must be multiple of 8 (I'm a
lazy programmer and I found that the easiest way to keep buffer handling
at peak performance ;-).
Q) I'm getting a "bad font!" fatal error.
A) By default, DOS GLUT compiles with GLUT_IMPORT_LIB, to cope with variable
access inside dynamic modules (same mechanism used for Win32 _DLL). Since
-DGLUT_IMPORT_LIB affects Mesa's `glut.h', your apps must be compiled the
same way GLUT was compiled (either with or without defining it). If you
want to use another `glut.h' when building your own demos, or just don't
feel happy about this, make sure you remove the line with GLUT_IMPORT_LIB
from `Mesa/src/glut/dos/Makefile.DJ' before (re)making GLUT. Beware, this
means you will never EVER be able to safely use `glut.dxe'!
Q) What is NUL driver good for, if I don't get any output at all?
A) For debugging. The NUL driver is very much like OSMesa. Everything is
done just the same as VESA/VGA drivers, only it doesn't touch your video
hardware. You can query the actual buffer by issuing:
DMesaGetIntegerv(DMESA_GET_BUFFER_ADDR, &buffer);
and dump it to a file.
Q) How do I query for a list of available video modes to choose as a visual?
A) This is an ugly hack, for which I'm sure I'll burn in hell.
First, query for a list of modes:
n = DMesaGetIntegerv(DMESA_GET_VIDEO_MODES, NULL);
If `n' is strictly positive, you allocate an array of pointers to a given
struct (which is guaranteed to be extended only - not changed in future):
struct {
int xres, yres;
int bpp;
} **l = malloc(n * sizeof(void *));
Now pass the newly allocated buffer to fill in:
DMesaGetIntegerv(DMESA_GET_VIDEO_MODES, (GLint *)l);
And collect the info:
for (i = 0; i < n; i++) {
printf("%dx%d:%d\n", l[i]->xres, l[i]->yres, l[i]->bpp);
}
Q) The GLUT is incomplete.
A) See below.
@@ -165,8 +192,13 @@ chosen in such a way that first window will fit. If you need high resolution
with small windows, set initial position far to the right (or way down); then
you can move them back to any position right before the main loop.
The following environment variables can customize GLUT behaviour:
Environment variables:
~~~~~~~~~~~~~~~~~~~~~~
DMESA_NULDRV - (any value) force NUL driver
GLUT_FPS - print frames/second statistics to stderr
MESA_NO_SSE - (any value) safe option under pure DOS
DMESA_GLUT_REFRESH - set vertical screen refresh rate (VESA3)
DMESA_GLUT_BPP - set default bits per pixel (VGA needs 8)
DMESA_GLUT_ALPHA - set default alpha bits (8)
@@ -209,18 +241,37 @@ v1.3 (mar-2003)
* revamped GLUT
* switched to DXE3
v1.4 (oct-2003)
v1.4 (dec-2003)
+ enabled GLUT fonts with DXE
+ truly added multi-window support in GLUT (for Adrian Woodward)
* accomodated makefiles with the new sourcetree
* fixed some ALPHA issues
* minor changes to PC_HW/timer interface
x hacked and slashed the 3dfx driver (w/ help from Hiroshi Morii)
v1.5 (jan-2004)
+ added interface to query available "visuals" (GLFW - Marcus Geelnard)
+ added GLUT timer callback
- removed Matrox Millennium MGA2064W driver
x more changes to the 3dfx driver
v1.6 (aug-2004)
+ implemented NUL driver
+ added DMesaGetProcAddress and glutGetProcAddress
* reorganized fxMesa wrapper to handle multiple contexts
! fixed a horrible bug in VGA initialization routine
! fixed partial clears
v1.7 (???-2005)
+ enabled OpenGL 2.0 support
+ added support for sw texture compression
* minor rework
Contact:
~~~~~~~~
Name: Borca Daniel
Name: Daniel Borca
E-mail: dborca@users.sourceforge.net
WWW: http://www.geocities.com/dborca/

View File

@@ -1,53 +1,81 @@
August 30, 1998 -- Paul Garceau
Updated January 13, 2000 -- Paul Garceau (pgarceau@teleport.com)
DISCLAIMER: I make this port of the Mesa 3-D Graphics Library as a service
to the general public. I can, in no way support or make any guarantee that the
build will work for your system.
The associated packages and batch files I have included as part of the GCC-2.95.2/Mingw32 extension are provided "As-is" with out any guarantee of support or functionality from this author.
Feel free to modify or change things as you see fit, just remember that
I can't support any modifications you might want to make to the files which I
have included OR the lgpl protected Mesa 3-D Graphics Library.
I recommend using GCC-2.95.2/Mingw32 which is available at Mumit Khans' ftp site:
(ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/)
This build has been tested under WinNT4/SP6. Win9x and WinNT5 remain untested by me. I have not tested any of the demos included with Mesa3d.
I recommend using the GCC-2.95.2/Mingw32.
ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95.2
Much thanks to the combined efforts of Mumit Khan, Jan-Jaap Vanderhagen
and Colin Peters for making it possible for the Mingw32 toolchain to exist. Also, thanks go out to Stephane Rehel for the work that was completed on the Cygwin build.
Installing GCC-2.95.2/Mingw32 Build:
a) Open the file archive (either tar.gz or .zip extensions)
b) Decide the directory you want to move the archived files to.
d) Extract the files from the archive.
e) Edit the mingw32.bat file to accomodate your choice of directory structure.
%mesaroot%: This is your root directory (Mesa-3.3)
%mesasrc%: This is the Mesa-3.3 src directory (Mesa-3.3\src)
%mesalib%: This is where the build will put libGL.a and libGLU.a
Running the Build:
Open your Command Prompt or MS-DOS prompt.
Go to your Mesa-3.3 'root' directory
At the command line type: mingw32
That's all there is to it.
Enjoy!
Peace,
Mesa 6.1 for MinGW32
~~~~~~~~~~~~~~~~~~~~
Quick & dirty start:
--------------------
mingw32-make -f Makefile.mgw [OPTIONS...]
Look into the corresponding makefiles for further information.
Check README.3DFX to find out how to compile Mesa Glide3 driver
with MinGW32!
Contact:
--------
Daniel Borca <dborca@users.sourceforge.net>
WARNING! The info below this line is outdated (yet some of it useful). WARNING!
*******************************************************************************
August 30, 1998 -- Paul Garceau
Updated January 13, 2000 -- Paul Garceau (pgarceau@teleport.com)
DISCLAIMER: I make this port of the Mesa 3-D Graphics Library as a service
to the general public. I can, in no way support or make any guarantee that the
build will work for your system.
The associated packages and batch files I have included as part of the GCC-2.95.2/Mingw32 extension are provided "As-is" with out any guarantee of support or functionality from this author.
Feel free to modify or change things as you see fit, just remember that
I can't support any modifications you might want to make to the files which I
have included OR the lgpl protected Mesa 3-D Graphics Library.
I recommend using GCC-2.95.2/Mingw32 which is available at Mumit Khans' ftp site:
(ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/)
This build has been tested under WinNT4/SP6. Win9x and WinNT5 remain untested by me. I have not tested any of the demos included with Mesa3d.
I recommend using the GCC-2.95.2/Mingw32.
ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95.2
Much thanks to the combined efforts of Mumit Khan, Jan-Jaap Vanderhagen
and Colin Peters for making it possible for the Mingw32 toolchain to exist. Also, thanks go out to Stephane Rehel for the work that was completed on the Cygwin build.
Installing GCC-2.95.2/Mingw32 Build:
a) Open the file archive (either tar.gz or .zip extensions)
b) Decide the directory you want to move the archived files to.
d) Extract the files from the archive.
e) Edit the mingw32.bat file to accomodate your choice of directory structure.
%mesaroot%: This is your root directory (Mesa-3.3)
%mesasrc%: This is the Mesa-3.3 src directory (Mesa-3.3\src)
%mesalib%: This is where the build will put libGL.a and libGLU.a
Running the Build:
Open your Command Prompt or MS-DOS prompt.
Go to your Mesa-3.3 'root' directory
At the command line type: mingw32
That's all there is to it.
Enjoy!
Peace,
Paul G. (pgarceau@teleport.com)

View File

@@ -1,6 +1,6 @@
File: docs/README.WIN32
Last updated: Sep 18, 2003 - Karl Schultz - kschultz@users.sourceforge.net
Last updated: Oct 01, 2004 - Karl Schultz - kschultz@users.sourceforge.net
Quick Start
@@ -14,16 +14,36 @@ The build system has been changed to use Microsoft Visual Studio project
workspaces and projects. Makefiles are no longer shipped or supported, but
can be generated from the projects using Visual Studio.
The workspace and project files were created with Visual Studio 6, so that
they can be used with VS6 and so that they can also be imported into VS 7.
Details and Notes
- To build the Mesa libraries, open the Mesa.dsw workspace file
in the top directory. You can build each project one-by-one,
or build the glut project to build everything except osmesa,
which needs to be built separately. The build process will
create a lib directory in the top directory and will put the
following files there:
OPENGL32.LIB, GLU32.LIB, GLUT32.LIB, OSMESA32.LIB
OPENGL32.DLL, GLU32.DLL, GLUT32.DLL, OSMESA32.DLL
in the top directory. You will need to build at least one
driver. Currently, only the gdi and osmesa drivers are available.
Select one or the other as the active project and build it.
If you want glu, select the glu project as active and build that as well.
- Glut is no longer in the Mesa.dsw workspace. It is now built in
the demo workspace (see below).
- The build process will create a lib directory in the top directory
and will put the following files there as you build them:
OPENGL32.LIB, GLU32.LIB, OSMESA32.LIB
OPENGL32.DLL, GLU32.DLL, OSMESA32.DLL
- Some users have reported problems building glu with VS7 after importing
and converting the VS6 project files. The problem is caused by a custom
build step that was put in place to work around a problem with VS6 not
recognizing .cc files as C++ source files. It appears that VS7 can be
configured to recognize .cc files as C++ files and so it compiles these
glu files with the default settings, and does not use settings that are
required to compile the files correctly. The easiest way to solve the
problem is to remove the .cc files from the glu project. This does not
delete the files, but removes them from the project so that VS does not
try to compile them at all. This allows the custom build step to compile
the files with the proper settings.
- After building, you can copy the above DLL files to a place in your PATH
such as $SystemRoot/SYSTEM32. If you don't like putting things in a
@@ -51,9 +71,6 @@ Details and Notes
- The si-glu sources are used to build the GLU libs. This was done
mainly to get the better tessellator code.
- The osmesa driver builds and should work on Windows as well as
any other platform.
- The Windows driver (in src/Windows) builds and runs at least at
a minimal level. I modified this driver to work with the new
Mesa 4.0 code and driver architecture, but I did not do a great
@@ -75,6 +92,12 @@ Details and Notes
- No assembly code is compiled or assembled. Again, this may need
some work to turn it back on or use it again.
- To build "mangled" Mesa, add the preprocessor define USE_MGL_NAMESPACE
to the project settings. You will also need to edit src/mesa.def to change
all the gl* symbols to mgl*. Because this is easy to do with a global
replace operation in a text editor, no additional mangled version of mesa.def
is maintained or shipped.
If you have a Windows-related build problem or question, it is
probably better to direct it to me (kschultz@users.sourceforge.net),
rather than directly to the other Mesa developers. I will help you

View File

@@ -85,8 +85,8 @@ Using the library
=================
Configuration options:
The file src/config.h has many parameters which you can adjust such
as maximum number of lights, clipping planes, maximum texture size,
The file src/mesa/main/config.h has many parameters which you can adjust
such as maximum number of lights, clipping planes, maximum texture size,
etc. In particular, you may want to change DEPTH_BITS from 16 to 32
if a 16-bit depth buffer isn't precise enough for your application.
@@ -311,4 +311,4 @@ Summary of X-related environment variables:
----------------------------------------------------------------------
$Id: README.X11,v 3.10 2003/03/08 17:38:57 brianp Exp $
$Id: README.X11,v 3.11 2003/12/17 15:14:31 brianp Exp $

View File

@@ -1,7 +1,7 @@
Mesa 5.1 release notes
Month day, 2003
December 17, 2003
PLEASE READ!!!!
@@ -24,6 +24,10 @@ See the VERSIONS file for a list of bugs fixed in this release.
New Features in Mesa 5.1
------------------------
GL_ARB_vertex_program / GL_ARB_fragment_program
Michal Krol and Karl Rasche implemented these extensions. Thanks!
Be aware that there may be some rough edges and lurking bugs.
GL_ATI_texture_env_combine3 extension
This adds a few new texture combine modes.
Contributed by Ian Romanick.
@@ -71,6 +75,24 @@ GL_IBM_multimode_draw_arrays
GL_SUN_multi_draw_arrays
An alias for GL_EXT_multi_draw_arrays, standard in OpenGL 1.4.
Faster glDrawPixels / glCopyPixels in X11 driver
If your X screen is 32bpp, glDrawPixels to the front color buffer will
be accelerated (via XPutImage()) if the image format is GL_BGRA and the
type is GL_UNSIGNED_BYTE. No raster operations, such as depth test,
blend, fog, etc. can be enabled.
If your X screen is 16bpp, glDrawPixels to the front color buffer will
be accelerated (via XPutImage()) if the image format is GL_RGB and the
type is GL_UNSIGNED_SHORT_5_6_5. No raster operations, such as depth
test, blend, fog, etc. can be enabled.
glCopyPixels() calls for the front color buffer will be accelerated
(via XCopyArea()) if no raster operations, such as depth test, blend,
fog, pixel zoom, etc. are enabled.
The speed-up over typical software rendering is a factor of 10 for
glDrawPixels and 100 for glCopyPixels.
With the addition of GL_ARB_occlusion_query, GL_ARB_vertex_buffer_object,
GL_ARB_texture_non_power_of_two and GL_EXT_shadow_funcs, Mesa 5.1 supports
@@ -148,6 +170,10 @@ Old files:
New files:
program.[ch] - generic ARB/NV program code
arbprogram.[ch] - ARB program API functions
arbfragparse.[ch] - ARB fragment program parsing
arbvertparse.[ch] - ARB vertex program parsing
arbparse.[ch] - ARB vertex/fragment parsing
arbparse_syn.h - vertex/fragment program syntax
nvprogram.[ch] - NV program API functions
nvvertprog.h - NV vertex program definitions
nvfragprog.h - NV fragment program definitions
@@ -156,13 +182,33 @@ New files:
nvvertexec.[ch] - NV vertex program execution
swrast/s_nvfragprog.[ch] - NV fragment program execution
Removed files:
swrast/s_histogram.[ch] - moved into src/histogram.c
The files related to per-vertex handling have changed.
Old files:
tnl/t_eval_api.c - old per-vertex code
tnl/t_imm_alloc.c - old per-vertex code
tnl/t_imm_api.c - old per-vertex code
tnl/t_imm_debug.c - old per-vertex code
tnl/t_imm_dlist.c - old per-vertex code
tnl/t_imm_elt.c - old per-vertex code
tnl/t_imm_eval.c - old per-vertex code
tnl/t_imm_exec.c - old per-vertex code
tnl/t_imm_fixup.c - old per-vertex code
tnl/t_vtx_sse.c - old per-vertex code
tnl/t_vtx_x86.c - old per-vertex code
New files:
tnl/t_save_api.c - new per-vertex code
tnl/t_save_loopback.c - new per-vertex code
tnl/t_save_playback.c - new per-vertex code
tnl/t_vtx_eval.c - old per-vertex code
Other New files:
Other new files:
bufferobj.[ch] - GL_ARB_vertex_buffer_object functions
version.h - defines the Mesa version info
Other removed files:
swrast/s_histogram.[ch] - moved into src/histogram.c
Other Changes
-------------
@@ -190,6 +236,11 @@ The ctx->_TriangleCaps field is deprecated.
While testing _TriangleCaps bits was fast, it was kludgey, and setting
the bits in the first place could be error prone.
New vertex processing code.
The code behind glBegin, glEnd, glVertex, glNormal, etc. has been
totally rewritten. It's a cleaner implementation now and should use
less memory. (Keith)
To Do

87
docs/RELNOTES-6.0 Normal file
View File

@@ -0,0 +1,87 @@
Mesa 6.0 release notes
January 16, 2004
PLEASE READ!!!!
Introduction
------------
Mesa uses an even/odd version number scheme like the Linux kernel.
Odd numbered versions (such as 5.1) designate new developmental releases.
Even numbered versions (such as 6.0) designate stable releases.
Mesa version 6.0 signifies two things:
1. A stabilization of the 5.1 development release
2. Implementation of the OpenGL 1.5 specification. When you query
glGetString(GL_VERSION) "1.5" will be returned (as long as the
driver supports all the required features).
Note that the Mesa major version number is incremented with the OpenGL
minor version number:
Mesa 1.x == OpenGL 1.0
Mesa 2.x == OpenGL 1.1
Mesa 3.x == OpenGL 1.2
Mesa 4.x == OpenGL 1.3
Mesa 5.x == OpenGL 1.4
Mesa 6.x == OpenGL 1.5
New Features
------------
Mesa 5.1 already had all the new features of OpenGL 1.5, implemented as
extensions. These extensions were simply promoted to standard features:
GL_ARB_occlusion_query extension
GL_ARB_texture_non_power_of_two extension
GL_ARB_vertex_buffer_object extension
GL_EXT_shadow_funcs
Device Drivers
--------------
Mesa advertises itself as either OpenGL 1.2 or OpenGL 1.3 depending on
the device driver. For example, if the driver enables all the ARB
extensions which are part of OpenGL 1.3 then glGetString(GL_VERSION)
will return "1.3". Otherwise, it'll return "1.2".
A number of Mesa's software drivers haven't been actively maintained for
some time. We rely on volunteers to maintain many of the drivers.
Here's the current status of all included drivers:
Driver Status
---------------------- ---------------------
XMesa (Xlib) implements OpenGL 1.5
OSMesa (off-screen) implements OpenGL 1.5
FX (3dfx Voodoo1/2) implements OpenGL 1.3
SVGA implements OpenGL 1.3
Wind River UGL implements OpenGL 1.3
Windows/Win32 implements OpenGL 1.5
DJGPP implements OpenGL 1.5
GGI implements OpenGL 1.3
BeOS implements OpenGL 1.5
Allegro needs updating
D3D needs updating
Other Changes
-------------
See the VERSIONS file for more details about bug fixes, etc. in Mesa 6.0.
----------------------------------------------------------------------
$Id: RELNOTES-6.0,v 1.3 2004/01/15 15:47:57 brianp Exp $

Some files were not shown because too many files have changed in this diff Show More