Vladimir Dergachev [Tue, 11 Jan 2005 05:59:07 +0000 (05:59 +0000)]
Switch back to using immediate mode code - use of AGP space is interfering with texture management.
Ideally, r300_render is ready to be rewritten to use standard Mesa include files, but I don't think I'll get around to it.
Vladimir Dergachev [Tue, 11 Jan 2005 04:11:05 +0000 (04:11 +0000)]
Move the few definitions from r300_lib.h still in use to r300_emit.h.
Rework *vb* function to not use AOS_ARRAY structure, but rather work directly with r300->state.aos.
Remove references to r300_lib.h and r300_lib.c
Remove r300_lib.[c,h].
Vladimir Dergachev [Tue, 11 Jan 2005 03:55:04 +0000 (03:55 +0000)]
Switch r300_state.c to use r300_fixed_pipelines.h instead of r300_lib.h.
This fixes potentially buggy memcpy()'s between potentially different structures.
Vladimir Dergachev [Tue, 11 Jan 2005 03:50:04 +0000 (03:50 +0000)]
Copy sample pixel and vertex shaders to r300_fixed_pipelines.h
Brian Paul [Mon, 10 Jan 2005 23:16:49 +0000 (23:16 +0000)]
remove a debug line
Brian Paul [Mon, 10 Jan 2005 23:15:59 +0000 (23:15 +0000)]
tweak output formattting, fixed uninitialized var error
Felix Kuehling [Mon, 10 Jan 2005 22:49:00 +0000 (22:49 +0000)]
Fixes to cope with the lack of AGP textures. This is all that's needed
to support PCI Savages on the Mesa side. Bumped driver date.
Alan Hourihane [Mon, 10 Jan 2005 19:44:59 +0000 (19:44 +0000)]
Fallback on PolygonStipple for CLE266 hardware.
Only upload stencil configuration when a stencil buffer exists.
Brian Paul [Mon, 10 Jan 2005 16:23:21 +0000 (16:23 +0000)]
Windows/ReactOS patch (Gregor Anich)
Keith Whitwell [Mon, 10 Jan 2005 14:36:25 +0000 (14:36 +0000)]
More changes to cope with color stride == 0
Keith Whitwell [Mon, 10 Jan 2005 12:30:08 +0000 (12:30 +0000)]
Fix segfault in pipes by dealing with stride == 0 case in generic_interp_extras
Vladimir Dergachev [Mon, 10 Jan 2005 05:24:28 +0000 (05:24 +0000)]
Bring vertex buffer code up to date..
Vladimir Dergachev [Mon, 10 Jan 2005 03:42:50 +0000 (03:42 +0000)]
For some reason we need r300Flush when using textures. Perhaps the problem is
with BITBLT_MULTI call ?
Vladimir Dergachev [Mon, 10 Jan 2005 03:22:54 +0000 (03:22 +0000)]
Clean up the code and make it unnecessary to issue extra calls to Setup*Shaders
in the r300_run_immediate_render function.
Bumps up glxgears fps count by about 100 points.
Vladimir Dergachev [Sun, 9 Jan 2005 23:37:03 +0000 (23:37 +0000)]
Port EmitPixelShader from cmdbuf.c to SetupPixelShader in state.c.
Vladimir Dergachev [Sun, 9 Jan 2005 22:38:53 +0000 (22:38 +0000)]
Implement a more elaborate hashing scheme for texture formats. Still not perfect.
Transform EmitVertexShader in cmdbuf.c to SetupVertexShader in state.c.
The latter is only temporary and is to be rewritten to auto-generate shaders based on current GL context.
Brian Paul [Sun, 9 Jan 2005 18:05:02 +0000 (18:05 +0000)]
minor readtex fixes
Brian Paul [Sun, 9 Jan 2005 18:00:49 +0000 (18:00 +0000)]
improved animation rate
Brian Paul [Sun, 9 Jan 2005 17:52:48 +0000 (17:52 +0000)]
rotate at fixed rate, changed fire effect (Marcelo Magallon)
Brian Paul [Sun, 9 Jan 2005 17:50:27 +0000 (17:50 +0000)]
rotate at fixed rate (Marcelo Magallon)
Brian Paul [Sun, 9 Jan 2005 17:39:36 +0000 (17:39 +0000)]
use #ifdef to test for extension
Brian Paul [Sun, 9 Jan 2005 17:39:06 +0000 (17:39 +0000)]
include readtex.h
Brian Paul [Sun, 9 Jan 2005 17:37:50 +0000 (17:37 +0000)]
better animate rate (Marcelo Magallon)
Brian Paul [Sun, 9 Jan 2005 17:26:08 +0000 (17:26 +0000)]
some new/improved rules
Brian Paul [Sun, 9 Jan 2005 17:15:41 +0000 (17:15 +0000)]
include readtex.h instead of readtex.c
Brian Paul [Sun, 9 Jan 2005 17:06:22 +0000 (17:06 +0000)]
include readtex.h instead of readtex.c (Marcello Magallon)
Brian Paul [Sun, 9 Jan 2005 17:00:57 +0000 (17:00 +0000)]
Add #ifdefs for extension testing (Marcello Magallon)
Brian Paul [Sun, 9 Jan 2005 16:52:53 +0000 (16:52 +0000)]
animation rate patch (Marcello Magallon)
Brian Paul [Sun, 9 Jan 2005 16:48:52 +0000 (16:48 +0000)]
rotate at a reasonable rate
Brian Paul [Sat, 8 Jan 2005 23:52:01 +0000 (23:52 +0000)]
compute reasonable animate rate (Marcelo Magallon)
Brian Paul [Sat, 8 Jan 2005 23:51:50 +0000 (23:51 +0000)]
fix-up rules for sphere demo, which uses readtex utility
Felix Kuehling [Sat, 8 Jan 2005 23:39:19 +0000 (23:39 +0000)]
* Flush and wait in per-primitive fallback functions. Fixes flickering
stars in glplanet.
* Refactored vertex format choosing code. Improved the Savage4 version
to choose a format suitable for DMA (size = 32bytes) whenever
possible.
Felix Kuehling [Sat, 8 Jan 2005 15:51:11 +0000 (15:51 +0000)]
Added missing break; to fix infinite recursion between choose_emit_func
and emit_viewport4_bgra4_st2_st2.
Felix Kuehling [Sat, 8 Jan 2005 15:03:25 +0000 (15:03 +0000)]
Added state debugging option (SAVAGE_DEBUG=state).
Fixed: Use savageEmitChangedRegs instead of savageEmitContiguousRegs for
emitting Savage4.
Adam Jackson [Sat, 8 Jan 2005 03:54:38 +0000 (03:54 +0000)]
Enable libGL to be built with DRI_NEW_INTERFACE_ONLY (but don't do it yet).
Adam Jackson [Sat, 8 Jan 2005 03:16:04 +0000 (03:16 +0000)]
Parallel build fix. Multiword variables on the target side of a : get
expanded into individual rules for each word, so parallel builds will
start multiple instances to create the server/ symlinks and fail when they
already exist.
Keith Whitwell [Fri, 7 Jan 2005 18:35:28 +0000 (18:35 +0000)]
Add t_vb_cull.c (Bernard Blackham)
Keith Whitwell [Fri, 7 Jan 2005 16:43:39 +0000 (16:43 +0000)]
And fix the obvious bugs in higher-numbered templates.
Keith Whitwell [Fri, 7 Jan 2005 16:25:40 +0000 (16:25 +0000)]
Templatize the fastpaths.
Keith Whitwell [Fri, 7 Jan 2005 15:54:48 +0000 (15:54 +0000)]
Add some more hardcoded fastpaths.
Keith Whitwell [Fri, 7 Jan 2005 15:27:41 +0000 (15:27 +0000)]
Cope with the possibility that incoming vectors may have
count < VB->Count.
Remove code to deal with the (should-be) impossible situation of null
input vectors.
Keith Whitwell [Fri, 7 Jan 2005 15:26:02 +0000 (15:26 +0000)]
Use the 'to' vector to determine the loop count.
Keith Whitwell [Fri, 7 Jan 2005 15:24:59 +0000 (15:24 +0000)]
Remove -C flags for install which aren't universally supported.
Felix Kuehling [Fri, 7 Jan 2005 10:55:13 +0000 (10:55 +0000)]
Fixed: ptex drawing functions were overridden with standard drawing
functions if ANY_RASTER_FLAGS|ANY_FALLBACK_FLAGS were set.
Keith Whitwell [Fri, 7 Jan 2005 10:36:14 +0000 (10:36 +0000)]
Add a clean target to remove generated files.
Keith Whitwell [Fri, 7 Jan 2005 10:35:51 +0000 (10:35 +0000)]
Add a noop install target
Keith Whitwell [Fri, 7 Jan 2005 10:35:23 +0000 (10:35 +0000)]
Improve the semantics of the 'install' target to make sure the right
file is really being installed. Useful if you have multiple versions
of a single driver directory hanging around and want to switch between
them for testing.
Keith Whitwell [Fri, 7 Jan 2005 10:34:13 +0000 (10:34 +0000)]
Add an install target
Keith Whitwell [Fri, 7 Jan 2005 10:34:00 +0000 (10:34 +0000)]
Make clean in the x86 directory.
Propogate 'install' target down to dri driver directory.
Ian Romanick [Fri, 7 Jan 2005 03:41:48 +0000 (03:41 +0000)]
Use GNU AS label aliasing, if available. This must be enabled by adding
'-DHAVE_ALIAS' to DEFINES in the config file used for building. On the
linux-dri-x86 build, this cuts 4KB from libGL.so. HAVE_ALIAS is not
currently enabled in any of the configs.
Ian Romanick [Fri, 7 Jan 2005 03:23:59 +0000 (03:23 +0000)]
Script to generate rough GLX protocol documentation (as might be seen in
an extension spec). It's not perfect, and it doesn't support certain
functions that other scripts here can (e.g., pixel functions). However,
it is a good start and has already proven useful to me.
Ian Romanick [Fri, 7 Jan 2005 03:22:56 +0000 (03:22 +0000)]
Track the GLX protocol names for GL types.
Ian Romanick [Fri, 7 Jan 2005 02:53:04 +0000 (02:53 +0000)]
Refactor the code that converts a transpose-matrix enum to a
regular-matrix enum.
Ian Romanick [Fri, 7 Jan 2005 02:39:09 +0000 (02:39 +0000)]
Pixel oriented render functions are now generated by the
glX_proto_send.py script. This eliminates ~600 lines of non-generated
code. With proper compiler optimization settings, it also decreases the
size of libGL.so by about 3KB.
Ian Romanick [Fri, 7 Jan 2005 02:29:42 +0000 (02:29 +0000)]
The generic_*_byte functions did not rount the command size to a
multiple of 4 correctly in some cases.
Brian Paul [Fri, 7 Jan 2005 01:17:42 +0000 (01:17 +0000)]
added GetAllFBConfigs()
Ian Romanick [Fri, 7 Jan 2005 00:48:24 +0000 (00:48 +0000)]
Revert some accidental cross-merge changes. Remove i915GetString. Migrate
a couple extensions that appeared in both device-specific card_extensions
strings to the shared one.
Brian Paul [Thu, 6 Jan 2005 23:59:37 +0000 (23:59 +0000)]
New GetAllFBConfigs() function. Some FBConfigs weren't reported before.
Brian Paul [Thu, 6 Jan 2005 21:56:16 +0000 (21:56 +0000)]
In choose_visual() we need to know if we're being called from
glXChooseVisual() or glXChooseFBConfig() so that we handle the
GLX_DOUBLEBUFFER and GLX_STEREO tokens correctly.
Added some new error checking in those functions too.
Aapo Tahkola [Thu, 6 Jan 2005 19:26:25 +0000 (19:26 +0000)]
Add radeon 9550 pci id.
Keith Whitwell [Thu, 6 Jan 2005 17:12:56 +0000 (17:12 +0000)]
Redraw on keypress, as apparently intended.
Alan Hourihane [Thu, 6 Jan 2005 14:35:44 +0000 (14:35 +0000)]
Add Intel i915GM support, and these extensions.
* GL_ARB_texture_cube_map
* GL_EXT_blend_equation_separate
* GL_ATI_blend_equation_separate
* GL_ARB_point_parameters
* GL_NV_blend_square
* GL_EXT_cull_vertex
* GL_ARB_depth_texture
* GL_SGIX_depth_texture
* GL_ARB_shadow
* GL_EXT_shadow_funcs
* GL_3DFX_texture_compression_FXT1
(Keith Whitwell, Tungsten Graphics)
Daniel Borca [Thu, 6 Jan 2005 14:34:48 +0000 (14:34 +0000)]
semantic in parameter names
Daniel Borca [Thu, 6 Jan 2005 14:09:18 +0000 (14:09 +0000)]
semantic in parameter names. changed emitter function.
Thomas Hellström [Thu, 6 Jan 2005 13:51:37 +0000 (13:51 +0000)]
Small Unichrome fixes:
1. Unlock hardware before aborting and dumping DMA buffers. Otherwise display system may deadlock.
2. Fix DMA init IOCTL call that got mixed up in one of the previous commits.
3. Fix AGP command alignment
Daniel Borca [Thu, 6 Jan 2005 07:46:37 +0000 (07:46 +0000)]
semantic in parameter names
Daniel Borca [Thu, 6 Jan 2005 07:45:17 +0000 (07:45 +0000)]
solved classic "char*" vs "char[]" conflict. we were mimicking a pointer variable at desired location and then we took its address. using array is more intuitive, as they give us the starting address instantly.
Daniel Borca [Thu, 6 Jan 2005 07:40:33 +0000 (07:40 +0000)]
protected against elfish directives
Daniel Borca [Thu, 6 Jan 2005 07:38:28 +0000 (07:38 +0000)]
semantic in parameter names
Daniel Borca [Thu, 6 Jan 2005 07:37:32 +0000 (07:37 +0000)]
removed detritus
Daniel Borca [Thu, 6 Jan 2005 07:36:56 +0000 (07:36 +0000)]
added "default" branch in `convertPalette'
Daniel Borca [Thu, 6 Jan 2005 07:35:46 +0000 (07:35 +0000)]
fix dstRGB factor
Vladimir Dergachev [Thu, 6 Jan 2005 04:39:51 +0000 (04:39 +0000)]
Turns out the kfountain.kss (as well as lesson19) had a bug - the size was set wrong. Fixed.
Vladimir Dergachev [Thu, 6 Jan 2005 04:02:52 +0000 (04:02 +0000)]
Add texture format to get lesson19 working again.
Vladimir Dergachev [Thu, 6 Jan 2005 03:56:18 +0000 (03:56 +0000)]
Switch to a more complicated scheme of choosing texture formats, as it looks
like the old one was prone to collisions (different value of format field was
required for same values of t->format going in).
Now use a hash for these purposes - this got kfiresaver.kss and lesson06 workingfrom the same code.
Ben Skeggs [Thu, 6 Jan 2005 00:10:11 +0000 (00:10 +0000)]
Added GL_POLYGON primitive. Single primitive between glBegin()/glEnd() now works.
Felix Kuehling [Wed, 5 Jan 2005 23:56:16 +0000 (23:56 +0000)]
* Fixed handling of scissors
* Only set scissor regs directly if drmMinor < 1
* Don't set texaddr to 0 when a texture unit is disabled. That would trigger
the tightened texture state check in the DRM if the texaddr and texdesc
registers were not emitted atomically.
Alan Hourihane [Wed, 5 Jan 2005 22:40:34 +0000 (22:40 +0000)]
support 720x480 and 960x540 modes
Alan Hourihane [Wed, 5 Jan 2005 21:49:52 +0000 (21:49 +0000)]
Only try to free the front buffer when it's a pbuffer.
Keith Whitwell [Wed, 5 Jan 2005 20:56:05 +0000 (20:56 +0000)]
Make the format of the fastpaths cleaner at the expense of a little
performance.
Add fastpaths for some more common vertex formats.
Alan Hourihane [Wed, 5 Jan 2005 20:13:04 +0000 (20:13 +0000)]
fix build problem
Keith Whitwell [Wed, 5 Jan 2005 18:14:38 +0000 (18:14 +0000)]
Improve some quad paths, gives gears a little boost.
Keith Whitwell [Wed, 5 Jan 2005 18:06:05 +0000 (18:06 +0000)]
Give attributes with zero-stride a count of 1 to make it easier
to avoid transforming the same attribute multiple times.
Don't light a single normal multiple times in light_fast_rgba*
Keith Whitwell [Wed, 5 Jan 2005 13:51:38 +0000 (13:51 +0000)]
make alloc-dma functions inline, rearrange some debug
Keith Whitwell [Wed, 5 Jan 2005 13:51:03 +0000 (13:51 +0000)]
Avoid a segfault in multiarb.c
Alan Hourihane [Wed, 5 Jan 2005 13:45:09 +0000 (13:45 +0000)]
Bring VIA driver up-to-date with regard to drm_*_t changes and remove
the xf86drmVIA.[ch] files.
Bring in the IRQ handler and Ring buffer code, but ring buffer is disabled
as it is with the Xserver. It certainly locks up the CLE266.
Keith Whitwell [Wed, 5 Jan 2005 12:58:14 +0000 (12:58 +0000)]
Add a couple of hardwired fastpaths to t_vertex.c.
Keith Whitwell [Wed, 5 Jan 2005 11:10:05 +0000 (11:10 +0000)]
If there is only one normal, don't transform it multiple times.
Vladimir Dergachev [Wed, 5 Jan 2005 04:56:23 +0000 (04:56 +0000)]
Reduce the amount of debug output, while still printing important messages.
Make guessing texture formats easier.
Vladimir Dergachev [Wed, 5 Jan 2005 00:18:46 +0000 (00:18 +0000)]
Play a little bit with texture formats.
Get NeHe demos 06, 07 and 19 working.
Vladimir Dergachev [Tue, 4 Jan 2005 22:52:53 +0000 (22:52 +0000)]
Sync with master copy.
Vladimir Dergachev [Tue, 4 Jan 2005 20:25:11 +0000 (20:25 +0000)]
Port code from r200 that implements color blending. Seems to work.
This can be tested with lesson19 from NeHe.
This has also shown that the alpha code does not work - we pick up a red tint
for transparent pixels somewhere.
Vladimir Dergachev [Tue, 4 Jan 2005 19:15:37 +0000 (19:15 +0000)]
Unify rendering of textured and non-textured primitives.
Vladimir Dergachev [Tue, 4 Jan 2005 18:59:47 +0000 (18:59 +0000)]
Major code restructuring:
* move proven code into the r300_state.c
* update ClearBuffer to cope with more dynamic state
* cleanup !
Brian Paul [Tue, 4 Jan 2005 14:48:14 +0000 (14:48 +0000)]
added GLX_NV_float_buffer
Brian Paul [Tue, 4 Jan 2005 14:33:47 +0000 (14:33 +0000)]
use HIDDEN macro to export fewer symbols (bug 2210)
Brian Paul [Tue, 4 Jan 2005 14:19:25 +0000 (14:19 +0000)]
directfb changes (Claudio Ciccani)
Keith Whitwell [Tue, 4 Jan 2005 12:57:02 +0000 (12:57 +0000)]
Add GL_EXT_fog_coord
Keith Whitwell [Tue, 4 Jan 2005 12:56:17 +0000 (12:56 +0000)]
Add GL_EXT_secondary_color
Keith Whitwell [Tue, 4 Jan 2005 12:53:41 +0000 (12:53 +0000)]
Turn specular lighting state on/off appropriately.