Corbin Simpson
568d369d77
Merge branch 'r345-cleanup' of git://people.freedesktop.org/~agd5f/mesa into r500test
...
Adding Alex's cleanup patches. This adds r5xx TCL! Whoo-hoo!
Conflicts:
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/radeon/radeon_chipset.h
src/mesa/drivers/dri/radeon/radeon_screen.c
2008-05-02 15:57:57 -07:00
Corbin Simpson
92a0e93ac3
Make radeon stuff build again.
...
Yet more evidence that I am incompetent with git.
2008-05-02 15:33:02 -07:00
Eric Anholt
3323ccb803
[intel] Warnings fixes.
2008-05-02 12:25:48 -07:00
Eric Anholt
6acb94f89e
[intel] Merge intel_ioctl.h. Not sure how this slipped by in the .c merge.
2008-05-02 12:25:12 -07:00
Alex Deucher
ae09292a6e
R300: fix rebase conflicts
2008-05-02 15:20:28 -04:00
Corbin Simpson
9a82fde43a
Merge branch 'r500test' of git://people.freedesktop.org/~airlied/mesa into r500test
...
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r500_fragprog.c
src/mesa/drivers/dri/r300/r500_fragprog.h
src/mesa/drivers/dri/radeon/radeon_chipset.h
src/mesa/drivers/dri/radeon/radeon_screen.c
2008-05-02 12:15:44 -07:00
Alex Deucher
9e7ae34da5
R3/4/5: fix TCL on r5xx, cleanup PVS code
2008-05-02 15:13:49 -04:00
Alex Deucher
a94cd0d774
R300: fix VAP_OUTPUT_VTX_FMT_1 defines
2008-05-02 15:13:49 -04:00
Alex Deucher
d5448ceb95
R300: cleanup VAP_CLIP_CNTL
2008-05-02 15:13:49 -04:00
Alex Deucher
e61dadf3de
R300: clean up VAP_PROG_STREAM_CNTL* register usage
2008-05-02 15:13:49 -04:00
Alex Deucher
2bd26f4afa
Update comment
2008-05-02 15:13:49 -04:00
Alex Deucher
e3721a3b3f
R5xx: various updates
...
- fixup VAP_CNTL setup
- remove extra instruction in r5xx passthrough shader
- add notes about pipe config
2008-05-02 15:13:48 -04:00
Alex Deucher
831fc138c1
R5xx: Add R5xx pci ids
2008-05-02 15:13:48 -04:00
Dave Airlie
28904e54d2
fixup r500 bits for renaming
2008-05-02 15:13:48 -04:00
Dave Airlie
de9c1c3627
r500: fixup fake shader to keep gears going
2008-05-02 15:13:48 -04:00
Dave Airlie
fbab11e9b0
r500: enable gb tiling for r5xx
2008-05-02 15:13:48 -04:00
Dave Airlie
6864220c28
r500: fixup support for emitting fragment program to hardware.
...
Also fixup the constant emission
this breaks glxgears from what I can see but its another step to correctness
2008-05-02 15:13:48 -04:00
Dave Airlie
3b7c5bfb98
r500: setup fragment program constant emission atom
2008-05-02 15:13:48 -04:00
Dave Airlie
6443da0865
r300: add rv530 pci id for the t60p laptop
2008-05-02 15:13:48 -04:00
Dave Airlie
c07534dc71
r300: this code really shouldn't be here.
...
For R500 just ignore it for now while I do something interesting like
run glxgears.
2008-05-02 15:13:48 -04:00
Dave Airlie
c0cb9bc84c
mesa: cleanup state emission and rs for r500
...
trivial clear app now renders
2008-05-02 15:13:48 -04:00
Dave Airlie
a453b3154e
r500 RS unit setup
2008-05-02 15:13:47 -04:00
Dave Airlie
ed1584aed8
more r500 vs r300 kickin
2008-05-02 15:13:47 -04:00
Dave Airlie
5a143e91dc
some basic r500 portage
2008-05-02 15:12:37 -04:00
Dave Airlie
8aa98a409b
r500: fragprog
2008-05-02 15:11:03 -04:00
Corbin Simpson
b15c49e59b
r5xx: Fragprog shader now handles TEX/TXP correctly.
2008-05-02 12:06:21 -07:00
Corbin Simpson
029cb1fd0f
Start of TEX/TXP support.
...
Still having problems with temps and consts, though...
2008-05-02 12:06:21 -07:00
Corbin Simpson
b5246de562
Added OPCODE_ABS, slightly fixed ADD/SUB
2008-05-02 12:06:21 -07:00
Corbin Simpson
6e96ea535a
Initial r5xx fragment program compiler support.
...
Includes fallback shader and a handful of working opcodes.
2008-05-02 12:06:21 -07:00
Corbin Simpson
c02d1863d1
Add chip id 71D5 (RV530 M66) to radeon_chipset.h
2008-05-02 12:06:21 -07:00
Dave Airlie
d06e61aa80
fixup r500 bits for renaming
2008-05-02 12:06:21 -07:00
Dave Airlie
a3996ba2d1
r500: fixup fake shader to keep gears going
2008-05-02 12:06:21 -07:00
Dave Airlie
8e33a83b68
r500: enable gb tiling for r5xx
2008-05-02 12:06:21 -07:00
Dave Airlie
70335540c6
r500: fixup support for emitting fragment program to hardware.
...
Also fixup the constant emission
this breaks glxgears from what I can see but its another step to correctness
2008-05-02 12:06:21 -07:00
Dave Airlie
14c3bdb3f7
r500: setup fragment program constant emission atom
2008-05-02 12:06:21 -07:00
Dave Airlie
e46c3d7bcf
r300: add rv530 pci id for the t60p laptop
2008-05-02 12:06:21 -07:00
Dave Airlie
99e75135ee
r300: this code really shouldn't be here.
...
For R500 just ignore it for now while I do something interesting like
run glxgears.
2008-05-02 12:06:21 -07:00
Dave Airlie
9d9f66cc8d
mesa: cleanup state emission and rs for r500
...
trivial clear app now renders
2008-05-02 12:06:21 -07:00
Dave Airlie
a87914993d
r500 RS unit setup
2008-05-02 12:06:21 -07:00
Dave Airlie
55418dc87d
more r500 vs r300 kickin
2008-05-02 12:06:21 -07:00
Dave Airlie
2ffa112ed3
some basic r500 portage
2008-05-02 12:05:28 -07:00
Dave Airlie
cd66f0e2d9
r500: fragprog
2008-05-02 12:04:04 -07:00
Alex Deucher
1226aba119
R3/4/5: fix TCL on r5xx, cleanup PVS code
2008-05-02 13:56:56 -04:00
Alex Deucher
25d9f2dd24
R300: fix VAP_OUTPUT_VTX_FMT_1 defines
2008-05-02 13:03:48 -04:00
Alex Deucher
734ef96d5f
R300: cleanup VAP_CLIP_CNTL
2008-05-02 12:48:39 -04:00
Alex Deucher
db1fc51ccc
R300: clean up VAP_PROG_STREAM_CNTL* register usage
2008-05-02 12:29:40 -04:00
Alex Deucher
45077fc323
Update comment
2008-05-02 10:54:20 -04:00
Alex Deucher
279ea105d8
R5xx: various updates
...
- fixup VAP_CNTL setup
- remove extra instruction in r5xx passthrough shader
- add notes about pipe config
2008-05-02 10:51:40 -04:00
Brian Paul
6e19f82c37
fix conversion of GLfloat display list IDs
...
Use floor() to convert to int (per Mark Kildard and the SI).
Also, change translate_id() to return a signed integer since we may be
offsetting from GL_LIST_BASE.
2008-05-01 14:59:34 -06:00
Alex Deucher
f25b37c1da
R5xx: Add R5xx pci ids
2008-05-01 16:02:58 -04:00
