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
Matthieu Herrb
16b310823b
Fix build without DRI
2006-06-21 00:12:27 +02:00
Keith Packard
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 commit)
2006-06-19 13:47:28 -07:00
Wang Zhenyu
d7e5d996aa
Merge branch 'master' into exa
2006-06-20 01:22:53 +08:00
Alan Hourihane
a73ab7f0e6
additions for rotation fixes
2006-06-19 11:35:42 +01:00
Alan Hourihane
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
Eric Anholt
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
f2ab3aa319
Fix DRI in EXA mode: Don't attempt to use XAA symbols (use the driver's internal
...
ones for EXA support when available). Also, add an abstraction of XAA/EXA
MarkSync and WaitSync functionality so we don't need to sprinkle the ifdefs all
over, and correctly use them.
2006-06-18 00:32:01 -07:00
Alan Hourihane
3592b432b4
fix 8bpp & 16bpp rotation modes for i8xx
...
series chips
2006-06-13 21:42:53 +01:00
Alan Hourihane
a50610b771
Use 800x600 mode to double check
2006-06-12 13:53:20 +01:00
Alan Hourihane
f02268b209
Don't rely on register check to find out
...
if we're resuming - it's not reliable.
But then, neither is the BIOS, but it's
the best we can hope for until Eric's work
is complete.
Try setting another mode to cater for some
broken BIOS' too.
2006-06-12 12:16:58 +01:00
Alan Hourihane
672c3d18db
Only mark rotation flags after initial screen setup.
...
Fixes bug #7053
2006-06-12 10:02:06 +01:00
Dave Airlie
6812b53820
intel: fix VT switch DRI locking
...
The DRI locking is incorrect at VT switch, due to reference counting
inside the driver. Just call the DRI directly.
2006-06-02 12:22:14 +10:00
Wang Zhenyu
bc42dbe07c
fix a typo
2006-05-22 11:22:03 +08:00
Wang Zhenyu
e70d99d51e
revert wrong setting for memorySize, which should
...
be at the range of pI830->Offscreen.
2006-05-19 15:47:19 +08:00
Wang Zhenyu
b3d79ad9ec
oop I830FALLBACK define error
2006-05-18 16:31:40 +08:00
Wang Zhenyu
33ad959323
Add DEBUG_I830FALLBACK for easier tracking
2006-05-18 11:32:59 +08:00
Wang Zhenyu
52af679c94
Check alignment require in PrepareSolid, noticed by Eric,
...
as pixmap offset align set is violated in Solid.
2006-05-18 11:31:14 +08:00
Wang Zhenyu
fdb52a8c6d
Solid planemask in PrepareSolid/Copy might be 0xffffffff
...
or bits up to the depth. This should save some fallback
case, noticed by Eric.
2006-05-18 11:24:46 +08:00
Dave Airlie
f97895efd5
fixup chipid override
...
This makes the ChipID override work so that we actually override the pci id
that gets used everywhere in the driver.
2006-05-17 14:46:37 +10:00
Wang Zhenyu
011a1c99d4
Fix memorySize to enable offscreen mem manage.
2006-05-17 11:16:00 +08:00
Keith Packard
f2967a2f5f
Video overlay gamma bounds checking must be done bytewise.
...
Also, pend bound computations to register writes to allow
updates to individual values that are 'out of spec' so
the client can update multiple values.
(cherry picked from 190f9ad060 commit)
2006-05-09 13:57:23 -07:00
Matthieu Herrb
99b0e53244
Fix non-dri build.
2006-05-01 10:47:09 +02:00
Matthieu Herrb
86f0119f47
Fix non-dri build.
2006-05-01 10:41:10 +02:00
Wang Zhenyu
fcec956807
Save initialize EXADriverPtr, and free it in failure.
2006-04-29 10:55:25 +08:00
Wang Zhenyu
0be9bc6044
I830CheckDevicesTimer() sync should be in I830_USE_XAA case.
2006-04-29 10:54:02 +08:00