Wang Zhenyu
290f15cd4c
fix alpha blending state
2006-11-29 17:14:55 +08:00
Wang Zhenyu
3d4edd325f
Add in sf/wm program for mask picture without CA
2006-11-29 17:05:32 +08:00
Wang Zhenyu
a704120b15
misc cleanup for G965 vs/sf/wm states
2006-11-29 16:52:44 +08:00
Wang Zhenyu
e3c70c68e3
WM kernel needs scratch space
2006-11-29 16:40:15 +08:00
Wang Zhenyu
aa515c54f0
Setup default border color for our samplers
2006-11-29 16:37:06 +08:00
Wang Zhenyu
b6eba96584
fix vertex buffer size
2006-11-29 16:30:53 +08:00
Wang Zhenyu
453842c9ff
clean up issue cmd to ring buffer
...
Make it easy to track different part of ring state, and
use rectlist primitive instead.
2006-11-29 16:24:24 +08:00
Wang Zhenyu
18ad7d5cf0
remove wrong scale_units
2006-11-29 16:04:16 +08:00
Wang Zhenyu
3d5bd0c14e
Rename exa sf/wm program files
...
Also fix some minors in wm program.
2006-11-29 16:02:16 +08:00
Wang Zhenyu
a06beb5f80
EXA state mem for G965
...
Not split offscreen mem for exa, but alloc a dedicated one
for G965 states.
2006-11-29 15:47:19 +08:00
Wang Zhenyu
4198f1216e
Mark current ps kernel is experimential with little test.
2006-10-10 15:50:10 +08:00
Wang Zhenyu
d485c1f2de
Use sf_prog.h instead
2006-10-10 14:11:35 +08:00
Wang Zhenyu
92c5020bbd
Fix picture's transform checking
2006-09-28 13:55:52 +08:00
Wang Zhenyu
5188028432
Fallback in mask picture for now
...
Do it later after finish wm kernel program.
2006-09-28 11:15:33 +08:00
Wang Zhenyu
25ff5baad9
Fix compile, add wm header file.
2006-09-28 11:09:52 +08:00
Wang Zhenyu
c3a49b5123
Add simplest wm kernel program for no mask picture composite
...
This is a try to use new gen4asm language, and will finish
composite program for mask picture with or without CA case later.
2006-09-28 10:36:00 +08:00
Wang Zhenyu
185df8a181
Add mask sampler state
2006-09-27 16:48:43 +08:00
Wang Zhenyu
1422d4f04a
change some src sampler states
...
sampler for mask should also be set up, and fix
default border texel.
2006-09-27 13:54:14 +08:00
Wang Zhenyu
52a4f2a02b
Add file for i965 exa composite
...
This does not include ps program, which will be added
in g4a form.
2006-09-25 14:35:51 +08:00
Wang Zhenyu
f272f0d811
Merge branch 'master' into exa
2006-09-25 14:15:21 +08:00
Wang Zhenyu
ff202f8e2a
Fix a typo to mark sync for XAA.
...
This should fix the scrolling screen corrupt in
XAA method.
2006-09-22 15:02:19 +08:00
A Costa
b3ddcf3348
Typo fix in man page (Debian bug #364559 ).
2006-09-21 23:18:43 +10:00
Wang Zhenyu
1681fe6bb0
Revert "fix default tex wrap mode with clamp"
...
oops, we've set border color to all zero, which should
give us transparent in RepeatNone case.
2006-09-20 09:36:02 +08:00
Wang Zhenyu
5adb05f0b8
fix default tex wrap mode with clamp
...
we don't set any 'default' border color,
default tex wrap mode should be clamp to edge.
2006-09-19 17:14:05 +08:00
Eric Anholt
e3ab89b032
shader program fix for component alpha set
...
If CA is set and blend op needs src alpha, the src
value is not needed and should be (src.A * mask.X).
This is found in handling exa magic two pass composite.
2006-09-19 10:27:36 +08:00
Wang Zhenyu
37429c3ecb
misc cleanup
2006-09-19 10:08:31 +08:00
Eric Anholt
bd758030a6
Add a compile flag to enable syncing after each operation in EXA.
...
This replaces other debug sync options sprinkled around the EXA code. It
doesn't change the mis-rendering of text on the 915.
2006-09-14 11:12:03 -07:00
Eric Anholt
f46c70e877
Add a note on maxX/maxY for the 2D rendering.
2006-09-14 10:05:51 -07:00
Eric Anholt
ce00db054b
Replace a couple of mis-uses of the screen's bpp when the pixmap's was needed.
2006-09-14 10:00:06 -07:00
Eric Anholt
71c2dd6336
Replace duplicated sync code in exa with a call to I830Sync.
...
The I830Sync version has additional code for the 965.
2006-09-14 09:54:19 -07:00
Alan Hourihane
564c830a91
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
2006-09-13 16:34:10 +01:00
root
bf49084ad7
bump max Xvideo height to 1088 to cope with some players.
2006-09-13 16:32:39 +01:00
Wang Zhenyu
59ce4180b9
reimplement Solid function
...
Replace COLOR_BLT_CMD with XY_COLOR_BLT_CMD, by which
device would care for direction and provide a (x,y) coord
interface. This fixes pixmap artifacts even in no composite
case.
2006-09-11 22:57:23 +08:00
Eric Anholt
b970166eab
Fix a compile failure from the last commit.
2006-09-08 11:09:19 -07:00
Eric Anholt
2b7602847a
Merge branch 'exa-origin' into exa
...
Conflicts:
src/i915_exa_render.c
2006-09-08 11:02:41 -07:00
Eric Anholt
e4cdc42a98
Remove another debug printf.
2006-09-07 10:32:02 -07:00
Eric Anholt
099be52a3b
Re-remove xf86_ansic.h, and move copyright to the top of the file.
2006-09-07 10:28:09 -07:00
Eric Anholt
4ad577f83f
Remove the UTS/DFS implementations that just match the fallback versions.
2006-09-07 10:24:23 -07:00
Alan Hourihane
8b9d7a5f85
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
2006-09-07 17:45:57 +01:00
Alan Hourihane
6500a3aa13
When in MergedFB mode, fix offscreen memory allocation.
2006-09-07 17:45:28 +01:00
Eric Anholt
c378328ece
Remove a debug printf.
2006-09-06 11:15:17 -07:00
Eric Anholt
1e6e288b88
Add a check for intel-gen4asm, and rules to compile {wm,sf}_prog.h using it.
...
This adds assembly source for the two programs used in the textured video
implementation on the 965, which should make them easier to modify in the
future. The compiled versions are also included, so that intel-gen4asm isn't a
build requirement for people that aren't modifying these programs.
There are minor differences in the compiled versions of these programs compared
to their previous versions which were compiled with a different tool. I
believe the changes should be harmless, and video continues to work on my
system.
2006-09-01 16:47:17 -07:00
Alan Hourihane
1feb733eb8
Fix bug with probing info of DFP2 and LFP2 connected
...
devices (Aaron Ridout)
2006-08-29 14:54:15 +01:00
Alan Hourihane
26e6c074c1
Fix SetVBlank to operate all the time
2006-08-28 11:55:38 +01:00
Wang Zhenyu
b45f4b54b1
Making render log a little quiet in normal
2006-08-25 16:23:18 +08:00
Wang Zhenyu
cc79b3ec19
Current 915 render operations for 915G/945G only
2006-08-24 10:28:59 +08:00
Wang Zhenyu
078af29fa6
Merge branch 'master' into exa
...
Conflicts:
man/i810.man
src/Makefile.am
src/i830_accel.c
src/i830_dga.c
src/i830_driver.c
2006-08-24 10:23:22 +08:00
Alan Hourihane
ea63e82ef4
fix typo
2006-08-22 16:40:08 +01:00
Alan Hourihane
dc4128ea07
remove GL* usage
2006-08-21 12:13:42 +01:00
Alan Hourihane
dad0e7fc09
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-intel
2006-08-21 12:08:01 +01:00