Commit Graph

221 Commits

Author SHA1 Message Date
Eric Anholt 4ad577f83f Remove the UTS/DFS implementations that just match the fallback versions. 2006-09-07 10:24:23 -07:00
Eric Anholt c378328ece Remove a debug printf. 2006-09-06 11:15:17 -07:00
Eric Anholt 7458a6adb5 Move MAPSURF_XBIT settings into the texture formats structure. 2006-07-31 10:18:18 -07:00
Eric Anholt 7ea74843bb Whitespace cleanup. 2006-07-31 10:18:06 -07:00
Eric Anholt 30952e58ed Limit drawing to the destination pixmap's boundaries, not the screen's.
This shouldn't matter, as miComputeCompositeRegion shouldn't giving us
anything that would draw outside the bounds, anyway.
2006-07-26 13:42:12 -07:00
Eric Anholt cffd2cd36d Fix hangs when compositing with a mask.
The modify bits in the mask field for sampler/map state appear to actually
be enable bits.  So, prepare the state values in I915TextureSetup,
then write the sampler/map state out all at once in PrepareComposite.
2006-07-26 13:30:55 -07:00
Eric Anholt 96754b822d Fix a couple of typos from code review. 2006-07-26 13:19:12 -07:00
Eric Anholt 9c93d1498f Oops, partial revert of last commit. Some were obviously not NOOPS. 2006-07-25 21:17:05 -07:00
Eric Anholt 38d1a5e0db Replace some OUT_RING(0)s with OUT_RING(MI_NOOP) to remind me why they're there. 2006-07-25 21:09:12 -07:00
Wang Zhenyu aec88cf4c6 remove crap blit in UploadToScreen, we should find a more
efficent way and implement blit correctly.
2006-07-24 15:46:19 +08:00
Wang Zhenyu 02c5c4cd1d add copyright info 2006-07-21 12:54:06 +08:00
Wang Zhenyu 4f0ad33709 fixup segfault in xaa when xaa not initialized in i830WaitSync. 2006-07-21 11:59:04 +08:00
Eric Anholt 914327f40d Disable drawing to PICT_a8, and turn on support for non-extended repeats.
We don't know what COLOR_BUF_8BIT does, so it's disabled for now while we're
stabilizing the code.

The non-extended repeats appear to be working according to the rendercheck
tests on a8 and a8r8g8b8 sources.  Masks continue to hang the card, as before
this change.
2006-07-20 18:01:03 -04:00
Eric Anholt 45cb032e2b Use MT_8BIT_A8 so PICT_a8 expands to (0,0,0,a) not (a,a,a,a) 2006-07-20 18:01:03 -04:00
Eric Anholt fd6d825ae0 Move ss6 setting with other immediate state, and ensure that stencil is off. 2006-07-20 18:01:03 -04:00
Eric Anholt d6d6a44c66 Try to fix up the basic RepeatNormal and RepeatNone support.
With RepeatNone, access outside of the drawable should return 0 alpha values,
which is done by using the border color.  For RepeatNormal, we use the wrap
mode (which requires that we use normalized texture coordinates).
2006-07-20 18:01:03 -04:00
Eric Anholt 2b2173c618 The pixmap's drawable x/y coordinates are always 0, so don't bother using them. 2006-07-20 18:01:02 -04:00
Eric Anholt 9f1cec83e0 The vertex data are all floats, so write the dest coords as floats. 2006-07-20 18:00:29 -04:00
Wang Zhenyu 4737955a62 move i830 default coord set into I830EmitInvarientState 2006-07-21 01:02:38 +08:00
Wang Zhenyu a7e30bb051 Take from i915, blend ctl code cleanup. 2006-07-21 00:56:58 +08:00
Wang Zhenyu ac34a37cb6 Take instruction fixes into i830, with indent changes. 2006-07-21 00:52:59 +08:00
Wang Zhenyu 3e86bf4273 remove i915 default ctx setup. 2006-07-20 13:43:27 +08:00
Wang Zhenyu 5c945bf9eb Revert "Fix several size error with STATE3D_LOAD_STATE_IMMEDIATE cmd."
This reverts commit 433cb6ba82.
2006-07-20 13:40:39 +08:00
Eric Anholt d5243d1b35 The height and width of texture maps are one more than the programmed values. 2006-07-19 19:27:53 -04:00
Eric Anholt 13e372c209 Fix the texture map pitch setting as documented, and as used by the 3d driver. 2006-07-19 17:25:10 -04:00
Eric Anholt da5efb09d5 Fix the alignment padding fix (didn't bump BEGIN_LP_RING count). 2006-07-19 16:36:52 -04:00
Eric Anholt 36aa43bf73 Force texture alpha channels to 1 if not present. 2006-07-19 16:22:46 -04:00
Eric Anholt adce6bd0fc Add a trailing MI_NOOP to frag shader output for alignment if necessary. 2006-07-19 16:21:49 -04:00
Eric Anholt 4e409ea441 The map bits per pixel must come from the drawable, not the visible screen. 2006-07-19 15:57:09 -04:00
Eric Anholt 449e4be503 Correct the DWORD count of several 3D instructions. 2006-07-19 13:34:06 -04:00
Eric Anholt f1b62d890c Replace hand register setting with new i915 fragmet program API. 2006-07-19 13:02:24 -04:00
Eric Anholt 76a316d0ce Merge branch 'master' into exa
Conflicts:

	src/Makefile.am
2006-07-19 12:31:36 -04:00
Eric Anholt 84805167ab Convert i915 rotate code to the new fragment program API. 2006-07-18 18:27:10 -04:00
Eric Anholt 5176d62ba5 Add an API for programming i915 fragment programs. 2006-07-18 18:24:28 -04:00
Eric Anholt 148ef9bdd9 Convert magic numbers to symbolic names in i915 rotate code.
This doesn't cover the fragment shader yet, which we need to make a sensible
set of macros for (at least the basic bits).

Reviewed by:	md5
2006-07-18 17:11:34 -04:00
Wang Zhenyu 433cb6ba82 Fix several size error with STATE3D_LOAD_STATE_IMMEDIATE cmd.
Issue texture coord set with proper scale value.
2006-07-18 17:00:50 +08:00
Wang Zhenyu 855a9f13cb fallback in 'repeat' case for now 2006-07-18 10:02:47 +08:00
Alan Hourihane 16d6263e65 whoops, reverse part of that. 2006-07-16 20:39:52 +01:00
Alan Hourihane 2f50f6d1b1 move ContextMem out of XF86DRI 2006-07-16 20:17:38 +01:00
Wang Zhenyu 04d1584737 Current exa render implement for i830 and i915, test on
865GM and 915G. There is issue in picture 'repeat' support.
And also stop recursive behavior in I830WaitLpRing to allow
server to abort instead of system hang.
2006-07-14 16:14:18 +08:00
Alan Hourihane b1c2ea6535 whoops, revert some unnecessary changes 2006-07-11 08:13:30 +01:00
Alan Hourihane 8a44a7acfc Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel 2006-07-11 07:41:27 +01:00
Alan Hourihane 584b544987 Add an additional check before rotating 2006-07-11 07:40:40 +01:00
Eric Anholt b85f268051 Fix remaining warning. 2006-06-26 16:26:58 +02:00
Eric Anholt 6a3f89f4b6 Merge branch 'master' into exa
Conflicts:

	src/i830.h
2006-06-26 16:25:58 +02:00
Eric Anholt 3cdc53797b Fix build with new EXA headers. 2006-06-26 16:23:55 +02:00
Eric Anholt e7723a4e57 Merge branch 'origin' 2006-06-26 16:04:33 +02:00
Eric Anholt 5111b88348 Turn on extra warning flags for GCC, and clean up the resulting fallout. 2006-06-26 14:53:10 +02:00
Alan Coopersmith dae9cb7712 Provide definitions of __FUNCTION__ for non-gcc compilers 2006-06-22 15:07:16 -07:00
Alan Hourihane 5a1b68993f Fix build without DRI 2006-06-21 08:41:16 +01:00