mesa: Changes to 'master'
Dave Airlie
airlied at kemper.freedesktop.org
Wed May 28 00:23:47 UTC 2008
The branch, master has been updated
Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master
Summary of changes:
src/mesa/drivers/dri/r300/Makefile | 1 +
src/mesa/drivers/dri/r300/r300_cmdbuf.c | 193 ++-
src/mesa/drivers/dri/r300/r300_context.c | 5 +
src/mesa/drivers/dri/r300/r300_context.h | 67 +-
src/mesa/drivers/dri/r300/r300_emit.c | 40 +-
src/mesa/drivers/dri/r300/r300_emit.h | 29 +
src/mesa/drivers/dri/r300/r300_fragprog.c | 208 ++--
src/mesa/drivers/dri/r300/r300_fragprog.h | 64 +-
src/mesa/drivers/dri/r300/r300_ioctl.c | 267 +++-
src/mesa/drivers/dri/r300/r300_reg.h | 2078 ++++++++++++++++----------
src/mesa/drivers/dri/r300/r300_render.c | 25 +-
src/mesa/drivers/dri/r300/r300_shader.c | 41 +-
src/mesa/drivers/dri/r300/r300_state.c | 778 +++++++---
src/mesa/drivers/dri/r300/r300_swtcl.c | 58 +-
src/mesa/drivers/dri/r300/r300_texstate.c | 28 +-
src/mesa/drivers/dri/r300/r500_fragprog.c | 1669 +++++++++++++++++++++
src/mesa/drivers/dri/r300/r500_fragprog.h | 79 +
src/mesa/drivers/dri/r300/radeon_context.c | 2 +-
src/mesa/drivers/dri/radeon/radeon_chipset.h | 109 ++
src/mesa/drivers/dri/radeon/radeon_screen.c | 163 ++-
src/mesa/drivers/dri/radeon/radeon_screen.h | 2 +
21 files changed, 4570 insertions(+), 1336 deletions(-)
create mode 100644 src/mesa/drivers/dri/r300/r500_fragprog.c
create mode 100644 src/mesa/drivers/dri/r300/r500_fragprog.h
via 3e6c791390fd03ca04302f1312b94cd3c5ca0054 (commit)
via 261a15cf6389eba434d6857e78b524707803ed08 (commit)
via 85af4fde7fd5c7f6a6976fbd9d6529a9082f42b7 (commit)
via 867f5aac5361eda657491a98feca33c91eae3218 (commit)
via 5552500cdfc4b97f5c824f6af1f8213c785693f9 (commit)
via 8c39e24ec397200420146faa4f48672eadeac9b2 (commit)
via a242b331c6567af20d3cad804664bda30e1e9586 (commit)
via 9412aee4dc6a94ffc3d4043e8c843ba051f5507b (commit)
via eee53dfb22e0c950b11a466ebcd5d764864229cd (commit)
via 7278266612fe6be91b30b084de666a1ac4f2c20b (commit)
via 774b3bc5a57dc768ed09516a6b91358783c63f72 (commit)
via 4af22c9076954d544417e615561695695773708d (commit)
via 8eb7df63029ebc7c30c67c0266d727f9c240b402 (commit)
via b5372746ffcaab4ce158c1ca205e039a561ca01f (commit)
via 9f03e93de9a0b75485d1de8a990513b0c2582385 (commit)
via 7b88f40116cc6ccff5c0f7c923a0dca31187480e (commit)
via 5a5ba350696e6b753a9e49da010513670b697db5 (commit)
via b57ba7c5b0205ad6885530f63cef85401386565b (commit)
via 5499685931cac382bffb053ab527d882a7d0e109 (commit)
via a2db33219debbc1a2a64a8b096b321d263cfacb5 (commit)
via 21b352bb146e1b35050c1315b0d44689dcfdc8d6 (commit)
via 27d8fcd506942b115e480cfe9ca811194736579a (commit)
via f776f693c0aca4d01cc2bfdaedbb527062189e6d (commit)
via 594760148cb42cdaf568eef63357fac1c1b7f124 (commit)
via bd74d2aa26a2b87b05e8d086c020a6bdde9e06a7 (commit)
via 810270ad11d51c65e33bbe9337c2db9dd4cebb98 (commit)
via f1d04cd76681a3b8d37bc1a06b7ab36350087135 (commit)
via b6b51906824bbf02769eeaf42646ff709877ae42 (commit)
via 6f918a9fda91321b50ae327791787f21417226c8 (commit)
via af77de66d9e97a1f37849a51f7b48ae36a0c8127 (commit)
via e9031d6f63947963e2105e5aaf89cb57dcd9a122 (commit)
via 9ab7a2df030fe3eb7b82a99d9f17093c0036bc06 (commit)
via 30e61500e162453d7affd855fe531ed2d1d6e80b (commit)
via 34010bcc91bc2e8503e7b80187c1aea0e51e53b0 (commit)
via d4e93864b8f05f8973d291ac287b27febbb5cb62 (commit)
via a01816da59cd7a18fca281ef94a822f08cec5c6e (commit)
via 4f9dcdc35b277aa1ded60059a654da22d2075067 (commit)
via 0dfbe9cdd7e076fb23d90e99e225fd0e19b63dfb (commit)
via d06f4edb146cfb42fa2a3f654db141f88dcfe074 (commit)
via 1e2907f170116138b1ae304dc075ee52e377fd73 (commit)
via bb57c30a537f2ae01a146dd697ca332f7667c5c5 (commit)
via b453b0e2e1c82e6d08180c341989d6d0c05f21fa (commit)
via 9ec2b1c83f3390dac2e5e7d3aa21ff4920f29243 (commit)
via 2bda1a9502206ca2b7b35e39c82356f91de06914 (commit)
via 94994b13c51e076a4df069d550ec2f27550f6a28 (commit)
via 78fa5060593b9a419281230a264eb1180c9ed2b2 (commit)
via f0d76d526b0d37f36085d58b0c5c8cb9d9d9d7c9 (commit)
via 2005de48f9b87de6fffb792a6b16a880e92e3d82 (commit)
via 282cdc8b5c2495195fab8ee4afa9a7903caa459e (commit)
via 476248befe2bd04558ce53e937230c1a400a51b6 (commit)
via 03b3fed8f1dcd5df5049b9236cfaa60a17e56e6f (commit)
via ac315792bfccd547e6f84faabbb76c48af48a404 (commit)
via 60b8e1f5243dfc3233d38700755a06c38b4967f1 (commit)
via cddab021e392ed78b5375ef6924bc7d4dbdd01c0 (commit)
via c60bdcf8a80b7307add8e09aca2356591c86fbcd (commit)
via 2708d7f7005c6a65980f5eb0377a9fd7917bce51 (commit)
via a6c38f2f648f91f35594383666eec01abdc19632 (commit)
via 2225b9bdb08228fc824e9011341e8c0916fe2e07 (commit)
via bdfd5d95c5543154f7af17f0c001dc2b7044c1c4 (commit)
via 126673261de0dc5d64b05e3f76ced6801c28fffb (commit)
via 0910d9d4d68a3757f8777974ead2e4e34f48433e (commit)
via c57b3b1d2c4344603763c8d200f111a132d3899f (commit)
via 6dd3c0ed962dd3c2d4db331d4c745b39b7dde8c3 (commit)
via 16cc362f0ba9fb240f3d47f06e74ac215c4d6c27 (commit)
via c11a33fe76123abb19cfc1da7d3701a44fca2f23 (commit)
via d5aa42166152c4817d4fb06f183552efc135304b (commit)
via 405ee871c54d78e63cef1a570578a755250102c8 (commit)
via 0de02f1716edc16257339af78f198072da87539f (commit)
via d8529d9b008ede05165317b8ebb834525fd9835c (commit)
via 5e075fb80968744c72dfaba062e0b591ac69fad0 (commit)
via ba50c3fed38283968f622d7f47437f56033f09b7 (commit)
via 791c95230cd399eaa5892d6e13d3ce08e6167e0c (commit)
via d6333af7e9b01d0e878ddbb92b5f972c67f5350f (commit)
via 9aa62c723807f569c55a8e0df069cb2eadad77ae (commit)
via 76f32499d20ac9ee12a1b7aafbd2493749364a86 (commit)
via a0bc6d2fb21e47c5e659bc113c0c47b2288a9898 (commit)
via 73af48fff5502bc156160ce74896ffd156ee08ee (commit)
via c9d5d11d2da77fada77dca1e239accd126fa3300 (commit)
via 412c850eaba82a06532fcb6300234a63e7ae037b (commit)
via 350c80fa99c759d3080d3c3876e525ae130d1b04 (commit)
via e1bffd03188479f85f09eba2b478d36d77a70264 (commit)
via 10e0a36a496a7032b15728343cf8ee2ca2df5cb3 (commit)
via 375656440bd03d229701a1c97ef3f2ac61ba6712 (commit)
via f86baae1a7092533c7c3d56846e7bae97590951b (commit)
via de3fc8b1c47eaa87917e1886d4a0988327438038 (commit)
via c5b7a1ee3cae26854c6a489ee2977e4134efabfd (commit)
via 8d70181b031d7557dd4083dc041cc7c658fddfc4 (commit)
via d09aa2138bdedf32569844fa14cf88f28d41020a (commit)
via 9ef4126d48153d4754b29bd4231d29dfb15fa73f (commit)
via 0cc8ed5cccd3073670f3b77189177d44eae9b099 (commit)
via e000f2ab6e8491bf8175c38c42fabb04833d5209 (commit)
via 2a4d1085cb9d2d03e6aeb2c71a59888826c31afd (commit)
via 3d1528027889d67ca98002833dcb42b3f2f48067 (commit)
via 53a7ccc08b286a02f5a276f213cfae31c8e6bf7c (commit)
via 1da094c9adf49c48a8b61ee7ab5336e8ba3f9e8d (commit)
via 49c30ce958e5e95e9e6ab79d2308751705d0ff22 (commit)
via dc24fb51a31de8443e653655105d4e1c88847bcc (commit)
via 40db59038cc62a5a8e4f94cb069eeb1d9b95a1a9 (commit)
via 20baf128ef39dca058636c1bff4c526a8879b3d5 (commit)
via 1562dd2c26d43bffa8c6bd08ec6128c750ad58ff (commit)
via fa465fb2b1ce4119e4ae8f9b64721f385f361ad9 (commit)
via 171ba1d0d154f7fdeb712fd411f19e1ebddd3b55 (commit)
via 06e2e1b87ce7db9f48b9d198d71d46636f7e6fe3 (commit)
via 66a49df9cba8f17059be420126346a4234e81cba (commit)
via 697680d687544c4495f05d5baa83659fb877477b (commit)
via 3816ae9ce835691e690d68f37ff6b01207068870 (commit)
via 1f420b008bd4bc7b5fe7809e7f7506ef5dcb7209 (commit)
via 66a5562ce2906fbf5b96d1cee18f9a31a78c4360 (commit)
via 63503f284863530d628f26bea27f2390aca518e5 (commit)
via b79a769b2d878d6e8e55f675209ffa7f3f2a6f68 (commit)
via 4ef195a36946c8d587d129abd54683c73eecc304 (commit)
via 0f07e0aea3c5eb5bfb307aa50e04f088b889ddfc (commit)
via a03e261193bdee1ae1cf3e12af3455cbf085fcc7 (commit)
via d3eb5df259698c6f4080f3e988fbdaaba9698636 (commit)
via 37924cf175b5f61ca85dab685ec5d7879519ebc4 (commit)
via cea4f1464b00e025859b3b5dc415ce135afebd92 (commit)
via 026ef8111a94f6449dfa5e5cc0ae91fca4e68c0c (commit)
via e081603850cb4e3839a76f0bfbb90cff922dff03 (commit)
via 568d369d7747c6cc2a421a816c85d888ccfc9957 (commit)
via 92a0e93ac33ceb64a4e7e930223950d4529cef37 (commit)
via ae09292a6e659eabc566a0fc2b1f6fa5e5fd8b36 (commit)
via 9a82fde43aaaeab4370126d549aee8061b3a6937 (commit)
via 9e7ae34da5aeb9a38c3f4280f6d9648faad48df5 (commit)
via a94cd0d77407a8cf5c151e1f5135eba5d11fdb2b (commit)
via d5448ceb956d1884bf7aac4667b79a0905fa4166 (commit)
via e61dadf3de3084157f25ce0fbcc07990bb44aae5 (commit)
via 2bd26f4afa4f87d3dd2a8b9715455fc3f5a05046 (commit)
via e3721a3b3fca5ad7d957ae95252405da0740fbf6 (commit)
via 831fc138c1617f5cb49da589ea5126c8eda364a4 (commit)
via 28904e54d2a1bae009cbb88088b81e8d5bbd15d5 (commit)
via de9c1c3627de778671c0fa1215a2c5e24d4374dc (commit)
via fbab11e9b08d107b04d53833286da1c1487c2708 (commit)
via 6864220c28c95991cf9577892156d670bd184007 (commit)
via 3b7c5bfb98cd4d3b675ac39ec62d0fa71a66a6dd (commit)
via 6443da0865a6ad8bdd7abc65a9621ba329fcb756 (commit)
via c07534dc719f53c0e59d59f3bd7dd25d1d32747c (commit)
via c0cb9bc84c1997d790d0b7efa8ed94fc601d7d19 (commit)
via a453b3154e063c3e934cb90a546e984a758dd14f (commit)
via ed1584aed892e9004a96b915c12a1adbc6b419f0 (commit)
via 5a143e91dcaf64d77694b85671c214f93e3e8512 (commit)
via 8aa98a409b16cfd1a035c3f60208207eb1cc4d41 (commit)
via b15c49e59bdc149b978d2b35a4efcc99d15f16b2 (commit)
via 029cb1fd0f576dd7587bc306b126318fbfcdde2d (commit)
via b5246de562706aa2f423edaa060f4530da84f3a0 (commit)
via 6e96ea535a8fe4d2487fed27c06feaeef449470d (commit)
via c02d1863d1bfa87c8c4fdd0c36f90245613d5bbd (commit)
via d06e61aa80fcf6d9681d5112f0625b1602975aed (commit)
via a3996ba2d1b43795c289d3e59e561e4fc84d9b7e (commit)
via 8e33a83b6820af84862c45c30829a8ef52578743 (commit)
via 70335540c68a35121979ac63d976fb5edc1d68ca (commit)
via 14c3bdb3f7de153d93eda13980275d2840d62016 (commit)
via e46c3d7bcf000803e2a7d7339fe36db4fb97cf62 (commit)
via 99e75135ee5437e47bb64983dbb2deaef131f2d6 (commit)
via 9d9f66cc8d57dc16bb94c092b3821b56afce6cab (commit)
via a87914993d2d4a5ed32adfe16e2a2ac006d997c0 (commit)
via 55418dc87d132875feb50c2bd9531b5f5ed13334 (commit)
via 2ffa112ed32cf8123e5177a0fe2c12130c6f78c7 (commit)
via cd66f0e2d9e79b03b4773ccacf758fd3d141ccab (commit)
via 1226aba119c46c09ec6620dc0be29b63fb3440a7 (commit)
via 25d9f2dd247f9d9cc4bb18032d10542fd67ccea2 (commit)
via 734ef96d5f7dae620115f328296d7e560e624042 (commit)
via db1fc51ccc24745e83bd2f635bed97787873341b (commit)
via 45077fc3232eebf2b657c552afa92b24e4770bb0 (commit)
via 279ea105d8e91aa922ad946b66ee076e5e7e21c7 (commit)
via f25b37c1da2c9f1109b9169b89216c2be4750f98 (commit)
via 44791e2d78f894e62ab00b85277ee3ad4515519f (commit)
via eff6f1203222a776c5990b5d104b57a7f69b9aab (commit)
via 09df5eaff2ba2694b82d1211fd24410cb2997e25 (commit)
via 9566cf0e2f326d8fe638748d0bc10626e8c0387e (commit)
via 4feac4e40e08d95c4549ef28ad89cc4d3d8f74a7 (commit)
via 583ed4bde3aa450f049ad893820aece9fb6b1a9a (commit)
via 3eb8e5871f3b3e572ae5e281f55fb7282c82c47e (commit)
via ed18005a9940c26cafa5ed8ccadc46e2fbe63f9e (commit)
via d019f101e840e20b0f47799c17336599d829ae54 (commit)
via 2b8e422b3173388075b010f10e935c735edcd9a1 (commit)
via 9e6e4ae49a49c60f9b15d9276a44a1ad25865c81 (commit)
via 57028236c8b6ab0a56cba3a504d1d8ff12ab6c0d (commit)
via 1c71ec4d45a8da2a5c83b09e2e39d4a7c2ecc99b (commit)
via 5da8289e9cc086ac9c010ee41d0c06161c240dbd (commit)
from 8bd70a7bbefe420dd696bfd6dc3b64d3dd17e884 (commit)
- Commits -----------------------------------------------
commit 3e6c791390fd03ca04302f1312b94cd3c5ca0054
Author: Dave Airlie <airlied at redhat.com>
Date: Wed May 28 10:23:25 2008 +1000
r300: disable cmdbuf debug again
commit 261a15cf6389eba434d6857e78b524707803ed08
Merge: 8bd70a7bbefe420dd696bfd6dc3b64d3dd17e884 85af4fde7fd5c7f6a6976fbd9d6529a9082f42b7
Author: Dave Airlie <airlied at redhat.com>
Date: Wed May 28 10:20:14 2008 +1000
Merge branch 'r500-support'
Bring in all the r500 3D code into master should be as stable as the r300
code it is landing on top off.
Conflicts:
src/mesa/drivers/dri/r300/r300_reg.h
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/radeon/radeon_screen.c
commit 85af4fde7fd5c7f6a6976fbd9d6529a9082f42b7
Author: Dave Airlie <airlied at redhat.com>
Date: Wed May 28 10:07:30 2008 +1000
r500: remove warnings and only start on newer drms.
This removes lots of warnings to the user, and only allows the driver
to run on > .29 drms for r500 cards.
commit 867f5aac5361eda657491a98feca33c91eae3218
Author: Alex Deucher <alex at botch2.com>
Date: Wed May 28 10:11:14 2008 +1000
R3/4/5xx: update to use drm get_param for num gb pipes
commit 5552500cdfc4b97f5c824f6af1f8213c785693f9
Author: Dave Airlie <airlied at redhat.com>
Date: Wed May 28 10:03:10 2008 +1000
r500: cleanup warnings and include files
---------------------------------
More information about the mesa-commit
mailing list