96754b822d
Fix a couple of typos from code review.
2006-07-26 13:19:12 -07:00
9c93d1498f
Oops, partial revert of last commit. Some were obviously not NOOPS.
2006-07-25 21:17:05 -07:00
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
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
02c5c4cd1d
add copyright info
2006-07-21 12:54:06 +08:00
4f0ad33709
fixup segfault in xaa when xaa not initialized in i830WaitSync.
2006-07-21 11:59:04 +08:00
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
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
fd6d825ae0
Move ss6 setting with other immediate state, and ensure that stencil is off.
2006-07-20 18:01:03 -04:00
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
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
9f1cec83e0
The vertex data are all floats, so write the dest coords as floats.
2006-07-20 18:00:29 -04:00
4737955a62
move i830 default coord set into I830EmitInvarientState
2006-07-21 01:02:38 +08:00
a7e30bb051
Take from i915, blend ctl code cleanup.
2006-07-21 00:56:58 +08:00
ac34a37cb6
Take instruction fixes into i830, with indent changes.
2006-07-21 00:52:59 +08:00
3e86bf4273
remove i915 default ctx setup.
2006-07-20 13:43:27 +08:00
5c945bf9eb
Revert "Fix several size error with STATE3D_LOAD_STATE_IMMEDIATE cmd."
...
This reverts commit 433cb6ba82
2006-07-20 13:40:39 +08:00
d5243d1b35
The height and width of texture maps are one more than the programmed values.
2006-07-19 19:27:53 -04:00
13e372c209
Fix the texture map pitch setting as documented, and as used by the 3d driver.
2006-07-19 17:25:10 -04:00
da5efb09d5
Fix the alignment padding fix (didn't bump BEGIN_LP_RING count).
2006-07-19 16:36:52 -04:00
36aa43bf73
Force texture alpha channels to 1 if not present.
2006-07-19 16:22:46 -04:00
adce6bd0fc
Add a trailing MI_NOOP to frag shader output for alignment if necessary.
2006-07-19 16:21:49 -04:00
4e409ea441
The map bits per pixel must come from the drawable, not the visible screen.
2006-07-19 15:57:09 -04:00
449e4be503
Correct the DWORD count of several 3D instructions.
2006-07-19 13:34:06 -04:00
f1b62d890c
Replace hand register setting with new i915 fragmet program API.
2006-07-19 13:02:24 -04:00
76a316d0ce
Merge branch 'master' into exa
...
Conflicts:
src/Makefile.am
2006-07-19 12:31:36 -04:00
84805167ab
Convert i915 rotate code to the new fragment program API.
2006-07-18 18:27:10 -04:00
5176d62ba5
Add an API for programming i915 fragment programs.
2006-07-18 18:24:28 -04:00
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
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
855a9f13cb
fallback in 'repeat' case for now
2006-07-18 10:02:47 +08:00
16d6263e65
whoops, reverse part of that.
2006-07-16 20:39:52 +01:00
2f50f6d1b1
move ContextMem out of XF86DRI
2006-07-16 20:17:38 +01:00
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
b1c2ea6535
whoops, revert some unnecessary changes
2006-07-11 08:13:30 +01:00
8a44a7acfc
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
2006-07-11 07:41:27 +01:00
584b544987
Add an additional check before rotating
2006-07-11 07:40:40 +01:00
b85f268051
Fix remaining warning.
2006-06-26 16:26:58 +02:00
6a3f89f4b6
Merge branch 'master' into exa
...
Conflicts:
src/i830.h
2006-06-26 16:25:58 +02:00
3cdc53797b
Fix build with new EXA headers.
2006-06-26 16:23:55 +02:00
e7723a4e57
Merge branch 'origin'
2006-06-26 16:04:33 +02:00
5111b88348
Turn on extra warning flags for GCC, and clean up the resulting fallout.
2006-06-26 14:53:10 +02:00
dae9cb7712
Provide definitions of __FUNCTION__ for non-gcc compilers
2006-06-22 15:07:16 -07:00
5a1b68993f
Fix build without DRI
2006-06-21 08:41:16 +01:00
16b310823b
Fix build without DRI
2006-06-21 00:12:27 +02:00
8a6edba332
Set vblank interrupt configuration to match pipe configuration
...
New i915 drm ioctl (in version 1.5) allows the X server to select
which pipe drives vblank interrupts. Use this to drive from the 'preferred'
pipe. Yes, per-window vblanks would be nice in a shared fb environment.
Maybe someday.
(cherry picked from 2fb375b665
2006-06-19 13:47:28 -07:00
d7e5d996aa
Merge branch 'master' into exa
2006-06-20 01:22:53 +08:00
a73ab7f0e6
additions for rotation fixes
2006-06-19 11:35:42 +01:00
1fe3dd38eb
Set some invarient state, cures some problems with
...
rotation at startup.
This mimicks the 3D drivers setup.
2006-06-19 11:27:28 +01:00
89a5a0024a
Fix crash with EXA during randr, when XAA structures were being accessed. EXA
...
shouldn't have any issues with there also being pixmaps in framebuffer while
rotation is active.
2006-06-18 00:32:17 -07:00
Eric Anholt
Eric Anholt
Wang Zhenyu
Alan Hourihane
Alan Coopersmith
Matthieu Herrb
Keith Packard