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/r300_fragprog.h | 60 ++ src/mesa/drivers/dri/r300/r300_ioctl.c | 16 +- src/mesa/drivers/dri/r300/r300_program.h | 150 ---- src/mesa/drivers/dri/r300/r300_reg.h | 290 +++++--- src/mesa/drivers/dri/r300/r300_state.c | 8 +- src/mesa/drivers/dri/r300/r300_vertprog.c | 1186 +++++++++++++---------------- src/mesa/drivers/dri/r300/r300_vertprog.h | 89 +-- 7 files changed, 821 insertions(+), 978 deletions(-) delete mode 100644 src/mesa/drivers/dri/r300/r300_program.h via 3e0797f3b702a1363bf238eb4826385860346137 (commit) via e49ec6e2a4b5002ac9766c828807fb0a10d975f2 (commit) via 82770b8c835812dd04d93083a0ac6cc2b6250e46 (commit) via a2c1aad27d2f9c88ba384f9861143c42c3c3eee7 (commit) via 863ab98ac758355fa80f70f84bbd69c066713554 (commit) via 42a04ada10e894212ecc02dcca1c4e050275a368 (commit) via 2ac29115542d81366a7d78571cc568976baf0251 (commit) via 74aee365e32defc910fd43301b6fcb651ad0568a (commit) via c75ffff84a2a98f0f027a262db904aedae3a5d06 (commit) via 47f08a9fb5ca3179ebf3c7a214b4062e27aead86 (commit) via e239871d5b28c05eceae91a748d36ea3ff4e5f18 (commit) via c30cc5904dc61c27ea7a4ebf5928c53bca6a7b1d (commit) via 3129d8b512d50335fc5c219b65e36fcaaffcd247 (commit) via 9a3d4b14e968c1203b58d782f7ad60bfb61150d9 (commit) via 916a53088ed7e34ec7df967329a7d87b25197e3c (commit) via 038e13b1ee04fe97191409b64c337f7bbe176b22 (commit) via 5dcbdc09f354d96cef93a28215f7776a5e84dd1f (commit) via bbab0f97b83b07184bc7c5a736292c8558903855 (commit) via 2a8b6c62a7a2c807dc1b4a515da62fc8918101c1 (commit) via a6d772ed16eddda85bae59e28eaab0d46debc30f (commit) via f80223d9ffac6c2c3a94ab7f896dad6a04da5c8b (commit) via b795e8db5f994f5bb6eabfe72ddc3f52e5bbc9f9 (commit) via dda906fcdbc2c1daa6de12873998290a1486138e (commit) via 7504981074c43f057176ffc6cc54754fae903a98 (commit) via 7e1878cdadcc98b18f926bb600dac10f0904327d (commit) via bb4188b85b175065ce627baca3ae87110079d44b (commit) via fb0947ed33cb290ca0179c836abccc86eaff7600 (commit) via e3a0a8dc7def2e154048d2c327896e99561b53e4 (commit) via 2fdd6d87f4923178f7f48c786853092c6a9e43bd (commit) via 95604e88e72902fe70b34afe5aede0f1e2d4d14b (commit) via 9c742911970b5131ed08204165e04a59cd0d26bf (commit) via 440a6fbf6e6b390b050e99b9c320a0fe8c9f798b (commit) via 8c4d811295f89bc59c54160bcaf861b47514b458 (commit) via b2c02a4a7c2948f06fc2470d3c53b2292a9d482f (commit) via b0e81fd19e7147927e9dbc3277886942f3b8c0f3 (commit) via 41c3ae577894f1e577753a94cb87d6c93a8b1c63 (commit) via 0ced26099d3ff2e82ffd5fe7915504b13341c812 (commit) via 7c4add02f80c7f16241ddbae18117d7cb264079d (commit) via bd46a482c479e7ce765e45f444ba0f7e54432a4e (commit) via 66952fa5aec04aa2abeefa0e949ce3812fae229d (commit) via 8a646b80ef518fd36bc5643ee91c0339d4ccb2fb (commit) via ea8299040f3a70b2912723bdea00778512da2897 (commit) via bccb56d5f395be994bcdb11a9f1007aca1dad1d8 (commit) via e0a5194a5427442869ace6772d16bb687cc87ec4 (commit) from 635e96471218d5ada3fa7930fc1a746ec2aa4423 (commit) - Commits ----------------------------------------------- commit 3e0797f3b702a1363bf238eb4826385860346137 Merge: 635e96471218d5ada3fa7930fc1a746ec2aa4423 e49ec6e2a4b5002ac9766c828807fb0a10d975f2 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Sat Mar 29 14:46:32 2008 +0000 Merge branch 'r300-vertprog-branch' of ssh://people.freedesktop.org/~z3ro/mesa commit e49ec6e2a4b5002ac9766c828807fb0a10d975f2 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Mar 26 08:01:13 2008 +0000 r300: Indented the vertex program code... commit 82770b8c835812dd04d93083a0ac6cc2b6250e46 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Mar 26 07:53:16 2008 +0000 r300: Cleaned up the default vertex program code with longer lines. commit a2c1aad27d2f9c88ba384f9861143c42c3c3eee7 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Mar 26 07:28:29 2008 +0000 r300: Removed the last of the duplicate vertex program macros. commit 863ab98ac758355fa80f70f84bbd69c066713554 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Mar 26 07:09:21 2008 +0000 r300: Added Copyright lines to the vertex program code. commit 42a04ada10e894212ecc02dcca1c4e050275a368 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Mar 26 06:31:33 2008 +0000 r300: Renamed the Mesa opcode translation functions. commit 2ac29115542d81366a7d78571cc568976baf0251 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Mar 26 06:24:48 2008 +0000 r300: Renamed the destination-and-opcode/source macros to more appropriate names. commit 74aee365e32defc910fd43301b6fcb651ad0568a Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Mar 24 12:46:56 2008 +0000 r300: Merged the constant zero/one source macros. commit c75ffff84a2a98f0f027a262db904aedae3a5d06 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Mar 24 12:46:40 2008 +0000 r300: Merged the Vector and Math Engine opcode macros. commit 47f08a9fb5ca3179ebf3c7a214b4062e27aead86 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Sun Mar 2 08:36:19 2008 +0000 r300: Corrected a bug with the SUB instruction. commit e239871d5b28c05eceae91a748d36ea3ff4e5f18 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Sun Mar 2 06:28:53 2008 +0000 r300: Corrected a bug with the MAD instruction. The PVS_VECTOR_OPCODE macro should be modified to support macro instructions, too. commit c30cc5904dc61c27ea7a4ebf5928c53bca6a7b1d Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Fri Feb 29 05:48:31 2008 +0000 r300: Added the PVS_SRC_OPERAND documentation from AMD. commit 3129d8b512d50335fc5c219b65e36fcaaffcd247 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Fri Feb 29 05:01:02 2008 +0000 r300: Added the PVS_OP_DST_OPERAND documentation from AMD. commit 9a3d4b14e968c1203b58d782f7ad60bfb61150d9 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 11:32:53 2008 +0000 r300: Added a TODO comment for registers missing from AMD's documentation. commit 916a53088ed7e34ec7df967329a7d87b25197e3c Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 11:16:52 2008 +0000 r300: Moved the vertex program shift/mask defines into the appropriate file. commit 038e13b1ee04fe97191409b64c337f7bbe176b22 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 11:07:08 2008 +0000 r300: Indented the vertex program code with longer lines. commit 5dcbdc09f354d96cef93a28215f7776a5e84dd1f Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 10:25:58 2008 +0000 r300: Moved the PREFER_DP4 define near the position invariant function. commit bbab0f97b83b07184bc7c5a736292c8558903855 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 10:13:29 2008 +0000 r300: Added a TODO comment for the MAD opcodes. commit 2a8b6c62a7a2c807dc1b4a515da62fc8918101c1 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 10:09:02 2008 +0000 r300: Use the VE_ADD hardware opcode for the SUB opcode. commit a6d772ed16eddda85bae59e28eaab0d46debc30f Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 10:04:54 2008 +0000 r300: Use the VE_MULTIPLY hardware opcode for the MUL opcode. commit f80223d9ffac6c2c3a94ab7f896dad6a04da5c8b Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 09:53:29 2008 +0000 r300: Cleaned up the XPD opcode temporary register usage. commit b795e8db5f994f5bb6eabfe72ddc3f52e5bbc9f9 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 09:41:47 2008 +0000 r300: Cleaned up extra white space. commit dda906fcdbc2c1daa6de12873998290a1486138e Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 09:39:09 2008 +0000 r300: Prefer to use the VE_ADD for simple MOV style opcodes. The VE_MULTIPLY_ADD has further restrictions on reading temporary memory which may complicate things. See AMD's documentation. commit 7504981074c43f057176ffc6cc54754fae903a98 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 09:27:15 2008 +0000 r300: Removed the (undocumented) MAD_2 opcode. This opcode is likely a mistake from reverse engineering. MAD_2 isn't included in AMD's documentation, and my testing reviles there is no problem using the documented MAD opcode. commit 7e1878cdadcc98b18f926bb600dac10f0904327d Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Thu Feb 28 09:16:48 2008 +0000 r300: Cleaned up the MAD/MAD_2 opcode selection. commit bb4188b85b175065ce627baca3ae87110079d44b Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Feb 27 12:36:33 2008 +0000 r300: Renamed some misleading macro arguments. commit fb0947ed33cb290ca0179c836abccc86eaff7600 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Feb 27 04:23:11 2008 +0000 r300: Cleaned up the vertex program macros. commit e3a0a8dc7def2e154048d2c327896e99561b53e4 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Feb 27 03:15:53 2008 +0000 r300: Removed duplicate component selection defines. commit 2fdd6d87f4923178f7f48c786853092c6a9e43bd Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Feb 27 02:34:26 2008 +0000 r300: Removed duplicate source register class defines. commit 95604e88e72902fe70b34afe5aede0f1e2d4d14b Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Feb 27 02:11:29 2008 +0000 r300: Renamed the vertex program source register macro. commit 9c742911970b5131ed08204165e04a59cd0d26bf Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Feb 27 02:10:13 2008 +0000 r300: Removed the (obsolete) special source register macros. commit 440a6fbf6e6b390b050e99b9c320a0fe8c9f798b Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Wed Feb 27 02:06:40 2008 +0000 r300: Cleaned up the special vertex program source register macros. commit 8c4d811295f89bc59c54160bcaf861b47514b458 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 13:16:05 2008 +0000 r300: Added the vertex program swizzle (aka selection) defines. commit b2c02a4a7c2948f06fc2470d3c53b2292a9d482f Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 13:09:15 2008 +0000 r300: Converted to the new src/dest register defines. commit b0e81fd19e7147927e9dbc3277886942f3b8c0f3 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:51:56 2008 +0000 r300: Removed an obsolete comment from the vertex program header file. commit 41c3ae577894f1e577753a94cb87d6c93a8b1c63 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:50:46 2008 +0000 r300: Converted to the new Math Engine defines. commit 0ced26099d3ff2e82ffd5fe7915504b13341c812 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:39:36 2008 +0000 r300: Added the Math Engine opcode macro. commit 7c4add02f80c7f16241ddbae18117d7cb264079d Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:37:26 2008 +0000 r300: Renamed the Vector Engine opcode macro. commit bd46a482c479e7ce765e45f444ba0f7e54432a4e Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:35:55 2008 +0000 r300: Converted to the new Vector Engine defines. commit 66952fa5aec04aa2abeefa0e949ce3812fae229d Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:26:48 2008 +0000 r300: Removed the duplicate dest register defines. commit 8a646b80ef518fd36bc5643ee91c0339d4ccb2fb Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:15:22 2008 +0000 r300: Removed the duplicate "easy" vertex program macros. commit ea8299040f3a70b2912723bdea00778512da2897 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:22:08 2008 +0000 r300: Added the vertex program src/dest register defines. commit bccb56d5f395be994bcdb11a9f1007aca1dad1d8 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 12:08:09 2008 +0000 r300: Added the Vector Engine and Math Engine defines from AMD's documentation. commit e0a5194a5427442869ace6772d16bb687cc87ec4 Author: Oliver McFadden <[EMAIL PROTECTED]> Date: Mon Feb 25 11:56:43 2008 +0000 r300: Moved the vertex and fragment program macros into the appropriate files. --------------------------------- _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit