Eric Anholt
bf0ae055de
Fix TTM static allocation flags.
2007-06-18 12:20:07 -07:00
Eric Anholt
1ddbfd779b
Test for TTM presence initially rather than test for lack of classic aperture.
2007-06-18 12:19:42 -07:00
Eric Anholt
2754ac0878
Replace intel_dump_batchbuffer with a more informational version.
2007-06-15 16:58:15 -07:00
Eric Anholt
7a452b21a2
Correct a mis-count in a LOAD_STATE_IMMEDIATE_1 length argument.
2007-06-15 16:20:34 -07:00
Eric Anholt
b9323aa2cb
Replace the flags/hint arguments to bo_alloc{,_static} with a location mask.
...
Now, allocations only take locations, rather than a variety of unused flags.
The only interesting flag before was the no_move/no_evict pair for scanout
and similar buffers, which the DRI drivers don't use. That will be readded
when we get to using this code for display buffer allocation, by adding a
pin/unpin call (dynamic pinning/unpinning may be useful for VT switching and
root window resizing).
This commit changes one instance of DRM_BO_FLAG_MEM_LOCAL with
DRM_BO_FLAG_MEM_TT, which appeared to have been unintentional.
2007-05-24 16:55:06 -07:00
Eric Anholt
fd9d27e068
Merge branch 'master' into i915-unification
...
Conflicts:
src/mesa/drivers/dri/i915tex/i830_texstate.c
src/mesa/drivers/dri/i915tex/i915_texstate.c
2007-05-24 16:46:54 -07:00
Brian
f116aed1ed
restore GL_TEXTURE_LOD_BIAS in _mesa_PopAttrib(), bug 11049
2007-05-23 16:51:30 -06:00
Brian
e5ed09e60e
incr/decr 1D/2DArray texture refcounts like other targets
2007-05-23 16:51:30 -06:00
Oliver McFadden
f2e99e6a58
r300: Call the r300Fogfv function directly within r300_state.c.
...
This required moving the r300Enable function but there are no actual changes.
2007-05-23 21:38:46 +00:00
Brian
a700832214
Fix problem w/ two-sided lighting and fragment programs (depth-peel regression)
2007-05-23 15:34:50 -06:00
Oliver McFadden
491618b33d
r300: Use switch statements in r300ResetHwState, etc.
2007-05-23 21:12:11 +00:00
Oliver McFadden
f1441bbd18
r300: Minor indenting corrections in the texture format table.
2007-05-23 18:48:05 +00:00
Oliver McFadden
ba8d3fb136
r300: Use a single texture format table; reduces duplication.
2007-05-23 18:37:55 +00:00
Oliver McFadden
9b9a1602f9
r300: Corrected the RGB888 texture format entry.
...
I think this is correct, assuming no endian issues. See commmit
59a08923f5
2007-05-23 17:56:47 +00:00
Oliver McFadden
bb3558e651
r300: Removed the R300_RS_INTERP_[0-9]_UNKNOWN (magic) defines.
...
Supposedly you need to set these values for the interpolaters to work, but they
seem to work fine without these values.
2007-05-23 17:44:14 +00:00
Brian
d062b6cd26
Fix point attentuation problem (bug 11042)
...
ctx->Point._Attentuation was computed in wrong place and the VB->Eye coord Z
array wasn't indexed correctly in run_point_stage().
2007-05-23 08:58:08 -06:00
Brian
a194bc3a85
Replace initInitState() with _mesa_init_driver_state().
2007-05-22 16:56:02 -06:00
Brian
a99114a69f
added _mesa_init_driver_state() to replace duplicated code in intel drivers
2007-05-22 16:54:25 -06:00
Brian
3a2ffadb7c
include swrast_setup/swrast_setup.h to silence warning
2007-05-22 16:50:05 -06:00
Brian
0425548961
don't treat FRAG_BIT_WPOS as a generic attribute (fixes depth peel regression)
2007-05-22 10:07:49 -06:00
Michel Dänzer
e0885b84a0
i915tex: Implement SetTexOffset hook.
...
Only build tested for I830 generation.
2007-05-22 14:08:11 +02:00
Michel Dänzer
59a08923f5
r300: Implement SetTexOffset hook.
2007-05-22 14:08:11 +02:00
Michel Dänzer
043d219b6d
Add interfaces for overriding texture images with driver specific 'offsets'.
...
To be used by AIGLX for GLX_EXT_texture_from_pixmap without several
additional data copies.
2007-05-22 14:08:10 +02:00
Michel Dänzer
24d965fab5
Fix xserver build after recent XMesa changes.
...
Only build tested.
2007-05-22 13:56:30 +02:00
Brian
9e3e3883fa
get rid of GenTexturesLock, used ctx->Shared->Mutex
2007-05-21 22:10:06 -06:00
Brian
c62da91f44
remove the unused texobj Mutex field
2007-05-21 21:59:20 -06:00
Brian
5c5ab90c76
remove a VMS-ism that doesn't seem needed elsewhere
2007-05-21 21:49:34 -06:00
Brian
a01ee8ff0b
improve some comments, clean-up formatting
2007-05-21 21:48:33 -06:00
Brian
3898e67f49
remove some whitespace
2007-05-21 21:48:08 -06:00
Brian
b4f8d4455b
set texcoords depending on GLX_Y_INVERTED_EXT
2007-05-21 20:57:09 -06:00
Brian
a10ba38df7
return True for GLX_Y_INVERTED_EXT query
2007-05-21 20:56:35 -06:00
Roland Scheidegger
74a30c351f
fog: fix potential issues with generated vp using fog
...
Change the generated vertex programs (tnl/brw) to follow the same logic as
the tnl fog wrt using absolute value, and sync them up a bit (untested).
2007-05-22 03:32:25 +02:00
Roland Scheidegger
3e21a014c3
fog: fix issues with negative fog coords (may fix #10529 )
...
Rework tnl fog a bit. Make sure we always use ABS(eyez) when fog coord source
is depth, OTOH it does not seem to be necessary to use it (as was done before
in some cases) if fog coord source is fogcoord (just to save some work).
This fixes tests/fog (the first 2 cases) with i915/i915tex.
2007-05-22 03:32:25 +02:00
Roland Scheidegger
7f1879d4e1
make sure optimized fog params get updated
2007-05-22 03:32:25 +02:00
Roland Scheidegger
1078ef83eb
i915/i915tex: minor cleanup (remove unneeded function call
2007-05-22 03:32:25 +02:00
Roland Scheidegger
b1c640deda
unbreak 3d textures (typo when setting tex layout)
2007-05-22 03:32:24 +02:00
Eric Anholt
b1fcabefa2
Don't read beyond the end of the buffer with INTEL_DEBUG=bat.
2007-05-21 13:06:12 -07:00
Eric Anholt
b0b84529cf
Enable INTEL_DEBUG environment variable.
2007-05-21 11:08:55 -07:00
Eric Anholt
2b325a9f32
Remove unused intel_batchpool.c.
...
This may need to be implemented again, but probably not as a buffer manager
(pool).
2007-05-21 10:53:33 -07:00
Eric Anholt
8b8d4d3e10
Notify the fake buffer manager on contended lock take.
2007-05-21 10:49:32 -07:00
Brian
a8676c45cc
if light position is local, treat it as a homogeneous coord and divide by W (see bug 11009)
2007-05-21 08:57:18 -06:00
Brian
9e8a961dd7
Overhaul/simplify SWvertex and SWspan attribute handling.
...
Instead of separate fog/specular/texcoord/varying code, just treat all of
them as generic attributes. Simplifies the point/line/triangle functions.
2007-05-20 12:27:39 -06:00
Brian
aa133a9dae
add missing right-paren
2007-05-20 12:17:21 -06:00
Oliver McFadden
9df4f842d5
r300: Added TODO comment regarding immediate mode implementation.
2007-05-20 17:20:10 +00:00
Oliver McFadden
62b6eef0d7
r300: Just use "inline" rather than "__inline__".
2007-05-20 13:38:32 +00:00
Brian
a2305ebfa2
need to copy new 1D/2D array texture objects in _mesa_PushAttrib()
2007-05-19 09:10:44 -06:00
Brian
74519c4231
Disable (at least for now) PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC typedef.
...
If an app (like progs/samples/blendxor.c) includes both gl.h and glext.h
this typedef will get hit in both headers, causing an error.
Possibly work around by bringing GL_NV_geometry_program4 items into gl.h.
2007-05-19 08:56:15 -06:00
Brian
80a5798719
added GL_EXT_texture_from_pixmap
2007-05-19 08:30:31 -06:00
Brian
4465377ca3
GLX_EXT_texture_from_pixmap test
2007-05-19 08:30:31 -06:00
Brian
7ace7cfba4
added texture_from_pixmap functions
2007-05-19 08:30:31 -06:00
