Commit graph

115447 commits

Author SHA1 Message Date
Eric Anholt
1bdee18536 Merge branch 'master' into i915-unification
Conflicts:

	src/mesa/drivers/dri/common/dri_bufmgr.c
	src/mesa/drivers/dri/common/dri_drmpool.c
	src/mesa/drivers/dri/i915tex/intel_batchpool.c
	src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
	src/mesa/drivers/dri/i915tex/intel_regions.c
	src/mesa/drivers/dri/i915tex/intel_screen.c
	src/mesa/drivers/dri/i915tex/intel_screen.h
2007-05-18 14:14:12 -07:00
Eric Anholt
c085e350df Fix a refcounting mistake with first_swap_fence. 2007-05-18 13:47:46 -07:00
Eric Anholt
a926b7397b Fix another mis-calling of _fence_wait_internal. 2007-05-18 13:47:21 -07:00
Eric Anholt
431baf221e Allow unreference with a NULL argument. 2007-05-18 12:59:39 -07:00
Eric Anholt
425d0c6305 Fix double-counting of low_offset in block->virtual. 2007-05-18 12:57:34 -07:00
Eric Anholt
b0529dcc7b Zero out bufmgr_fake on alloc. 2007-05-18 12:39:00 -07:00
Eric Anholt
71648a088e Dead code elimination and fix bufmgr_fake_wait_idle. 2007-05-18 12:10:05 -07:00
Eric Anholt
180f0bb964 Kill old struct bufmgr members. 2007-05-18 12:09:34 -07:00
Eric Anholt
bb1bb88bab Fix some use-before-initialize in bufmgr_fake. 2007-05-18 11:55:00 -07:00
Eric Anholt
4cf2cc0d18 Ratchet required version down to 1.5 (pre-TTM). 2007-05-18 11:29:55 -07:00
Brian
4fca6bfa5d fix STATE_HALF_VECTOR value (bug 10987) 2007-05-18 07:46:27 -06:00
Christoff Brill
8452814ec6 change max anisotropy test 2007-05-17 17:18:13 -06:00
Christoff Brill
63155ca2ca use R200_DEBUG for debug output 2007-05-17 17:17:25 -06:00
Christoff Brill
0985e786cd remove CVS/XFree86 keywords 2007-05-17 17:16:37 -06:00
Eric Anholt
b12b24a430 Restore missing intel_batchbuffer_reset() which was needed. 2007-05-17 15:36:43 -07:00
Eric Anholt
1f08f5d970 Rename the i915tex_dri.so driver to just i915_dri.so again. 2007-05-17 15:36:26 -07:00
Eric Anholt
cfc21190af Convert i915tex to the new interface and make it compile. 2007-05-17 15:28:01 -07:00
Brian
57ca033885 get rid of needless static function declarations at top of file 2007-05-17 15:28:42 -06:00
Brian
7fcf231c57 In DestroyPbuffer(), use GetReq() intead of GetReqExtra(). See bug 10983. 2007-05-17 15:28:42 -06:00
Ian Romanick
d834a870e6 Add missing _EXT suffix to 2D_ARRAY target enums. 2007-05-17 11:54:22 -07:00
Ian Romanick
817181ea50 Add array texture targets to list that can use compressed formats. 2007-05-17 11:16:19 -07:00
Ian Romanick
064cd7c78c Refactor determining whether a texture target can use compressed format 2007-05-17 11:14:58 -07:00
Brian
b5bbe055e4 make srcPtr param to make_1d_stack_mipmap() const 2007-05-17 08:56:46 -06:00
Brian
6ee6b2dcd9 Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa 2007-05-17 08:54:08 -06:00
Tommy Schultz Lassen
67f82731fc r300: Removed the radeon_vertex_buffer structure. 2007-05-17 14:11:23 +00:00
Ian Romanick
bb372f1c9b Initial implementation of MESA_texture_array
Shadow sampling from texture arrays is still not implemented.  Everything
else should be there, though.
2007-05-16 15:34:22 -07:00
Ian Romanick
9ebffb86a6 Initial version of MESA_texture_array spec. 2007-05-16 15:33:36 -07:00
Eric Anholt
7b971a5008 WIP: Replace TTM buffer pool manager with a simplified interface.
The interface is not solid yet (some simplification to do still, and
adjustment for 0-copy), and the drivers are not converted.  However, the new
interface allows using the same calls to support either a TTM or a classic
static allocation backend, with the static backend allowing a more limited
feature set.
2007-05-16 15:14:20 -07:00
Ian Romanick
2f61cbd30c Add simple program to test GL_MESA_texture_array. 2007-05-16 14:46:13 -07:00
Ian Romanick
78bd2912f8 Add enums and functions for GL_{MESA,EXT}_texture_array. 2007-05-16 14:45:52 -07:00
Ian Romanick
b0fe0d8a55 Bring framebuffer_texture's error checking more in-line with the spec. 2007-05-15 13:42:25 -07:00
Brian
347bb541f5 Skeleton file for 7.1 release notes. 2007-05-14 14:40:59 -06:00
Brian
c128c3ce8c master/trunk is now for Mesa 7.1 devel: bump versions 2007-05-14 14:30:36 -06:00
Bruce Merry
6efdf648f5 in __glXGetArrayType() return type, not enabled (bug 10938) 2007-05-14 09:38:23 -06:00
Brian
6a587c0124 comment about fixing uniform structs 2007-05-14 09:38:23 -06:00
Oliver McFadden
524c3336c4 r300: Enable the non-user-buffers code to compile. 2007-05-13 13:38:38 +00:00
Oliver McFadden
0e7e211055 r300: Use e32(0x0) rather than e32(0); makes greping for hex values easier. 2007-05-13 12:59:41 +00:00
Oliver McFadden
4e641bf3e9 r300: Use the defined values when writing to R300_RS_ROUTE_0. 2007-05-13 12:56:59 +00:00
Oliver McFadden
2189ff5e51 r300: Use the defined values when writing to R300_SE_VTE_CNTL.
You can verify this is correct with the following code.

  assert (0x043f ==
	  (R300_VTX_W0_FMT | R300_VPORT_X_SCALE_ENA | R300_VPORT_X_OFFSET_ENA
	   | R300_VPORT_Y_SCALE_ENA | R300_VPORT_Y_OFFSET_ENA |
	   R300_VPORT_Z_SCALE_ENA | R300_VPORT_Z_OFFSET_ENA));
2007-05-13 12:43:40 +00:00
Oliver McFadden
33a73466ae r300: Added a TODO comment for the R300_VAP_INPUT_ROUTE_[01]_0 values. 2007-05-13 12:36:27 +00:00
Oliver McFadden
13c0abd8a7 r300: Changed some more functions to static functions.
This required reordering some of the functions which is why the diff is a little
larger.
2007-05-13 09:09:30 +00:00
Oliver McFadden
82de92c0fb r300: Changed a couple of functions in r300_state.c to static functions. 2007-05-13 08:59:54 +00:00
Oliver McFadden
e4b8481f39 r300: Removed the unused r300_aos_rec (replaced by r300_dma_region) structure. 2007-05-13 08:43:30 +00:00
Oliver McFadden
b5990cec90 r300: Use #if 0 for disabled code, rather than commenting it out. 2007-05-13 08:28:51 +00:00
Oliver McFadden
d93642251e r300: Removed a couple of obsolete/commented out includes. 2007-05-13 08:21:50 +00:00
Oliver McFadden
c66fd808ac r300: A few very minor indenting corrections. 2007-05-13 07:51:41 +00:00
Oliver McFadden
73449270bb r300: Use the defined values for the interpolater (interp_magic) magic values. 2007-05-13 07:44:20 +00:00
Oliver McFadden
6f56e68ee3 r300: Use the defined values when writing to R300_VAP_INPUT_CNTL_[01].
You can verify this is correct with the following code.

  assert (0x00000001 == R300_INPUT_CNTL_0_COLOR);

  assert (0x00000405 ==
	  (R300_INPUT_CNTL_POS | R300_INPUT_CNTL_COLOR |
	   R300_INPUT_CNTL_TC0));
2007-05-13 06:39:24 +00:00
Oliver McFadden
65fae19383 Revert "r300: Perform the locking closer to the DRM texture upload call."
This reverts commit 93881edb46.
2007-05-12 17:18:57 +00:00
Roland Scheidegger
b78aec5767 bring over recent radeonMakeCurrent fixes for r300 to radeon/r200 2007-05-12 11:20:24 +02:00