Commit Graph

364 Commits

Author SHA1 Message Date
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
Alan Hourihane 361c49ad3c Fix bug #7930, i810 doesn't compile without DRI
(Samuel Thibault)
2006-08-21 12:07:29 +01:00
Eric Anholt 43daaec639 Bug #7905: Mark DRI state as dirty in 965 textured video, fixing hangs with 3d. 2006-08-17 15:58:29 -07:00
Alan Hourihane cdcc6f23e8 Disable device check when mergedfb in operation. 2006-08-16 17:16:28 +01:00
Alan Hourihane a94c96abf9 Fix bug #5150. Disable LVDS usage on i915G, i945G and i965G. 2006-08-16 17:15:26 +01:00
Wang Zhenyu 2a4e486d29 Fix undefined alloc type for agp memory
This shuts up the nonfatal warning that type 3 for alloc agp
memory is undefined for intel-agp.
2006-08-11 11:07:08 +08:00
Eric Anholt 4cfed93df6 Bump to 1.6.5 for release. 2006-08-10 15:41:32 -07:00
Eric Anholt 38e7e48418 Fix README typos from in the generated file. 2006-08-10 15:38:14 -07:00
Eric Anholt 975e602610 Bug #7829: Fix reported driver version.
The driver now reports itself as the PACKAGE_VERSION from autoconf.  The DRI
DDX -> client interface version is dissociated from this so that we can do
appropriate major/minor versioning of the interface that's not tied to the
package version.  Bumped the i830 ddx dri version patchlevel to note the
fix in the previous commit.
2006-08-10 13:49:43 -07:00
Eric Anholt 820e9a22fd Bug #7835: Restore unused fields in I830DRIRec to avoid i915 DRI breakage.
As it was, 1.6.4 broke compatibility with the released DRI driver.
2006-08-10 13:37:18 -07:00
Eric Anholt caa3b35cd7 Correct typos in README source. 2006-08-09 16:11:30 -07:00
Eric Anholt 2a7426cf13 Clean up warnings. 2006-08-09 15:47:09 -07:00
Eric Anholt 24e59a0daa Merge branch 'textured-video', bringing in fixed-up i915 textured video.
Conflicts:

	src/i830_video.c
2006-08-09 14:19:06 -07:00
Eric Anholt bb6080735e Bump to 1.6.4 for release. 2006-08-09 12:21:16 -07:00
Keith Packard 3ca14275d1 Add missing headers to i810_drv_la_SOURCES 2006-08-09 10:35:57 -07:00
Keith Packard 309374f78d Use double quotes to avoid sgml syntax error 2006-08-09 10:30:41 -07:00
Keith Packard dca9f856ca Reformat README 2006-08-09 10:29:59 -07:00