The branch, drm-gem has been updated Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=drm-gem
Summary of changes: Makefile | 1 + configure.ac | 209 +- docs/relnotes-7.1.html | 2 +- doxygen/header.html | 34 +- doxygen/header_subset.html | 22 +- include/GL/foomesa.h | 76 - progs/demos/lodbias.c | 2 +- progs/demos/texenv.c | 4 +- progs/glsl/.gitignore | 3 + progs/osdemos/ostest1.c | 7 +- progs/xdemos/glxgears.c | 187 +- src/glu/sgi/libutil/quad.c | 4 +- src/glut/os2/WarpWin.cpp | 838 ++++---- src/glut/os2/glut_cindex.cpp | 516 +++--- src/glut/os2/glut_gamemode.cpp | 1358 +++++++------- src/glut/os2/glut_win.cpp | 2440 +++++++++++----------- src/glut/os2/glut_winmisc.cpp | 252 ++-- src/glut/os2/os2_glx.cpp | 290 ++-- src/glut/os2/os2_menu.cpp | 1064 +++++----- src/glut/os2/os2_winproc.cpp | 2592 ++++++++++++------------ src/glx/x11/Makefile | 2 + src/glx/x11/dri2_glx.c | 98 +- src/glx/x11/dri_common.c | 399 ++++ src/glx/x11/dri_common.h | 60 + src/glx/x11/dri_glx.c | 746 ++------ src/glx/x11/drisw_glx.c | 441 ++++ src/glx/x11/glcontextmodes.c | 5 +- src/glx/x11/glx_pbuffer.c | 2 +- src/glx/x11/glxclient.h | 3 + src/glx/x11/glxext.c | 14 +- src/mesa/Makefile | 176 +-- src/mesa/drivers/Makefile | 29 + src/mesa/drivers/beos/Makefile | 2 + src/mesa/drivers/directfb/Makefile | 15 +- src/mesa/drivers/dri/Makefile.template | 1 - src/mesa/drivers/dri/common/dri_util.c | 43 +- src/mesa/drivers/dri/i915/Makefile | 8 +- src/mesa/drivers/dri/i915/i830_context.c | 2 +- src/mesa/drivers/dri/i915/i915_context.c | 2 +- src/mesa/drivers/dri/i915/i915_texstate.c | 7 +- src/mesa/drivers/dri/i915/intel_pixel_read.c | 9 - src/mesa/drivers/dri/i965/brw_wm_fp.c | 9 +- src/mesa/drivers/dri/i965/brw_wm_glsl.c | 2 +- src/mesa/drivers/dri/intel/intel_blit.c | 5 +- src/mesa/drivers/dri/intel/intel_chipset.h | 12 +- src/mesa/drivers/dri/intel/intel_context.c | 7 + src/mesa/drivers/dri/intel/intel_pixel_draw.c | 8 - src/mesa/drivers/dri/intel/intel_screen.c | 11 +- src/mesa/drivers/dri/r300/Makefile | 5 +- src/mesa/drivers/dri/r300/r300_context.c | 2 + src/mesa/drivers/dri/r300/r300_context.h | 185 +- src/mesa/drivers/dri/r300/r300_fragprog.c | 2367 +++------------------- src/mesa/drivers/dri/r300/r300_fragprog.h | 46 +- src/mesa/drivers/dri/r300/r300_fragprog_emit.c | 2058 +++++++++++++++++++ src/mesa/drivers/dri/r300/r300_ioctl.c | 17 +- src/mesa/drivers/dri/r300/r300_reg.h | 46 +- src/mesa/drivers/dri/r300/r300_render.c | 1 + src/mesa/drivers/dri/r300/r300_shader.c | 1 - src/mesa/drivers/dri/r300/r300_state.c | 178 +- src/mesa/drivers/dri/r300/r300_tex.c | 216 ++- src/mesa/drivers/dri/r300/r300_texmem.c | 6 +- src/mesa/drivers/dri/r300/r300_texstate.c | 239 ++-- src/mesa/drivers/dri/r300/r500_fragprog.c | 1672 +++------------- src/mesa/drivers/dri/r300/r500_fragprog.h | 13 + src/mesa/drivers/dri/r300/r500_fragprog_emit.c | 1533 ++++++++++++++ src/mesa/drivers/dri/r300/radeon_context.h | 10 - src/mesa/drivers/dri/r300/radeon_program.c | 281 +++ src/mesa/drivers/dri/r300/radeon_program.h | 164 ++ src/mesa/drivers/dri/r300/radeon_program_alu.c | 284 +++ src/mesa/drivers/dri/r300/radeon_program_alu.h | 38 + src/mesa/drivers/dri/r300/radeon_span.c | 24 + src/mesa/drivers/dri/swrast/swrast.c | 107 +- src/mesa/drivers/fbdev/Makefile | 36 + src/mesa/drivers/osmesa/Makefile | 74 + src/mesa/drivers/osmesa/osmesa.c | 14 +- src/mesa/drivers/x11/Makefile | 79 + src/mesa/drivers/x11/glxapi.c | 4 +- src/mesa/drivers/x11/xm_api.c | 16 +- src/mesa/drivers/x11/xm_glide.c | 3 +- src/mesa/main/image.c | 2 +- src/mesa/main/mm.c | 8 +- src/mesa/main/mm.h | 5 +- src/mesa/main/texenvprogram.c | 8 +- src/mesa/main/texstore.c | 4 +- src/mesa/shader/arbprogparse.c | 2 +- src/mesa/shader/prog_execute.c | 3 +- src/mesa/shader/prog_parameter.c | 24 +- src/mesa/shader/prog_print.c | 17 +- src/mesa/shader/programopt.c | 12 +- src/mesa/shader/programopt.h | 2 +- src/mesa/shader/slang/slang_compile.c | 31 +- src/mesa/shader/slang/slang_emit.c | 16 +- src/mesa/shader/slang/slang_ir.h | 1 + src/mesa/shader/slang/slang_link.c | 3 + src/mesa/sources | 65 +- src/mesa/swrast/s_context.c | 2 + src/mesa/swrast/s_context.h | 1 + src/mesa/swrast/s_zoom.c | 27 +- src/mesa/tnl/t_context.c | 14 +- src/mesa/tnl/t_pipeline.c | 2 +- src/mesa/tnl/t_vb_fog.c | 6 +- src/mesa/vbo/vbo_save_loopback.c | 3 - 102 files changed, 12006 insertions(+), 9990 deletions(-) delete mode 100644 include/GL/foomesa.h create mode 100644 src/glx/x11/dri_common.c create mode 100644 src/glx/x11/dri_common.h create mode 100644 src/glx/x11/drisw_glx.c create mode 100644 src/mesa/drivers/Makefile create mode 100644 src/mesa/drivers/dri/r300/r300_fragprog_emit.c create mode 100644 src/mesa/drivers/dri/r300/r500_fragprog_emit.c create mode 100644 src/mesa/drivers/dri/r300/radeon_program.c create mode 100644 src/mesa/drivers/dri/r300/radeon_program.h create mode 100644 src/mesa/drivers/dri/r300/radeon_program_alu.c create mode 100644 src/mesa/drivers/dri/r300/radeon_program_alu.h create mode 100644 src/mesa/drivers/fbdev/Makefile create mode 100644 src/mesa/drivers/osmesa/Makefile create mode 100644 src/mesa/drivers/x11/Makefile via bbe80af457316826f56ada767d26e8c1db7f1130 (commit) via 654258a4fe5e7114022c6e02f2844fc469fcc6f3 (commit) via cf29ab3ba075905cca786b52617d7dc993f58033 (commit) via 3e8aadee8beffaabd4e0c60c289b98124e288dcd (commit) via 30640695400b9b27656893753ae6b62f2082ce9b (commit) via 5b5bf2187497e8de53ca20db6c4fd4a211714b98 (commit) via 51ad6e34251f56e476432b92bd47858448c0e7ca (commit) via a1523c61eaa47825f0e4ca9076b83dcca19e1bd1 (commit) via 27b7f896d4492021f8b8c35a69c28f5854ab1f90 (commit) via e9d1889891ce32ffb3d6425f1e70510ea2c3e24b (commit) via ec2d0decbd739df99cac4baba57fe0005bf4894d (commit) via bbce58802d9bf94eadbb0d0c0211a0768f8302aa (commit) via 588abd66966a672a93e87cd577802255193bebcd (commit) via 1738a9a535cbde3a4b9f1b57f2a47139b4affdb9 (commit) via 776580a6afff9c6403140737ea50f36e9323528a (commit) via f7b8a13d65e97b8a9812f813cc670e6b712d583d (commit) via 6e6ca40f29551b6f6cedea954874930e6470b0b9 (commit) via 4fc66be2964efb0fbce101264b898636f8f1c715 (commit) via f1ae5d4b4471108049080b34c482a083ae74860a (commit) via 7413c55d93ccdf7ba58932d6186f1e6230df0e8a (commit) via 43da1189610fcaa5ade69620734a7b1e5caf84c4 (commit) via 825fdfd0c1fc9c82c8a880dea62a7fffc15d7373 (commit) via b97e48ffe3561288b5ebbebf7d439d4714fbb6a1 (commit) via 69004fb758629d5c2d201241fc3d2907dd9afde3 (commit) via 0a341ef29657c1ead116c4acaca138551631de16 (commit) via 9704414d1376d449ad6a006a16be8139f82b5d81 (commit) via a1c0c56d70308a562c90cc01982c89ed1396c830 (commit) via 83ad2a756ea8dd1b0ca9746e355ce3de0f29356e (commit) via 2882e5162525138316db9a1ab539a17498d06da1 (commit) via e34dc8227c1fa8bc9ffcd311de701053a633a7ec (commit) via b5170bc9d32530ec93dae4b543d3552e83d6b4a1 (commit) via e2aa45c2f9584ff76151a99b4fcd0ecb56260473 (commit) via caeabb1ebea33828e956efed19dce46767a068b4 (commit) via 4ba1c7d84826aaa07114872560cab3a428949499 (commit) via defadd9c03c726d1e79bd911de07a2682bf78b01 (commit) via b7669e4a8637a9680bcef0d0db82ae5e1984741c (commit) via 4919cc3a2c5e779834a3ff362e417f36f12b2b17 (commit) via b1056b6127d2bd6fa39ba7d88b5a49cd2765c469 (commit) via 1087cc61b3776f4cdc991dcd95ee59dbd26307f3 (commit) via 7ffb1230b3287a72d9ac59c5d830f7a4155cbdf9 (commit) via 341987f68842d662168aa6386723ef9ac8080a93 (commit) via 4297413656dd932a6bc2b56e16a2633ae8e712cd (commit) via 95b34baa8f981b08e21a36f9163d98a426559839 (commit) via 928ec5cd3be5c7d6f3d9df0ace18371b1ec8c68c (commit) via 53f5b9741a5453f9166aee8da6e1f8bf5b10d59e (commit) via effb73befa56099ba78ef2d93be4f980dad157b3 (commit) via 19659a50f9356023c59942794bd4e6e075f120bd (commit) via 2542c59c55589bdeaf56b9cf91625b0adf75e3ab (commit) via 74964ff04d89be430944dd8106bf5c97a9933f85 (commit) via 0440f5a187460078095f35902638300fee1c5158 (commit) via 41bdb88f271284b79b870a5217f3ae50d70dfcdd (commit) via 2b0e75ea7a2395cc8614d6eeabb9529d503652c9 (commit) via 3f3e4f645d389672e6d72215e60b812a887cc66d (commit) via 8d976aedc4654bc66b80f22690e3674f1ef46183 (commit) via 9563449c14f06b0927adecf36711c034b561e121 (commit) via c233b4245f7fcb667260278f3007d21044e62142 (commit) via 17ec0dbd7575de749377f6b33075e087ebe9fc9f (commit) via fbb96a0301e8cecb8835befe51286d954aa005c0 (commit) via a742bed99ae840d806198172005f6b25399ec573 (commit) via 72f87b69471649ff02e80a89f902b69980f3d025 (commit) via f6246f85d7c87180b464f84f330385680a82a601 (commit) via 910b3bfaeb372ef0e20c6b05c64c3721b739a442 (commit) via a80ccaadc77acbf835aa7139d75ea166efd8553f (commit) via 08c07b60be7c21819c78a3281dc9b5a9b547431b (commit) via 376203cff8e76bcfd664c4bb191c8a02ad41b744 (commit) via 5cf69fe511a67a7bcf6787974becf6a143abb507 (commit) via 906e189bd362399f1ffc4d5421ae0d0abd586977 (commit) via 079345703901b497f2c09714051b33bb2dff1b4f (commit) via 4c7e02298f68b84d929cd1d3af8b3120281c2e32 (commit) via 00099731195b2e5b57b8bca6342a8a711e0e427a (commit) via f440b0ddd9690a2f8d7b7eed9b56ff77407b9114 (commit) via 28c28f72fd9ed192467a3cf913b344951d0bc805 (commit) via 21f50818b09c1ab3b5b1dc797b34c23b9b1634dc (commit) via cb1687660844d42f929e11a2261c0eeb3fe859be (commit) via 7cb63a25de47bd941efd04c39d2758c2e91a313a (commit) via 731686b7132ff50d78ef2dc5bfab550750925132 (commit) via 75bfe630ff9df8b827cbdbf88b08e5da5d3eccfa (commit) via bf1a7c884d02d4a59ad51a446dec3736959d8239 (commit) via 5e58e5d77792891fac953ff0ec30990f3e0ca854 (commit) via f39780242e0dc7060d716fe255977a0a89734945 (commit) via ae18cbcfc51314c17d4fb7a2b4d44cd4a43adca4 (commit) via 9286a14fbe0e648c9ca24f6966ec9f4a87602f28 (commit) via fa1bc0d7d600b25ec1b9fce157a8c8ddc6723564 (commit) via 03a1144cd1de9425a0bc5ceec98f9c49fa19ac6d (commit) via 665605234d2aed2baa22fa621fa02478b2c08a4d (commit) via 0b72fada6aa3e15cee62c806057ebf986f34433d (commit) via 1d5b51abc8e9b3ba53a0854c27694309e740f256 (commit) via bde6b57e48693ee87676f4ff1e0bef54b426eeb5 (commit) via 847f54e2fa3e1b92ee97e7c2895a71ed20ce227b (commit) via dd750e0763d4a03a41d8a4ebde9489ad9c4aa82f (commit) via 358dcd71783beb69c4e3923138cf92c27b871159 (commit) via 04c6ca99dd194aac085c81044f876c17cd27baee (commit) via c9739b20555847c398e7b52fb0e580d86f958430 (commit) via f8563ddddb9edf056c3c0a5f676f93620c4ce37d (commit) via b55694512a1a762ddbe171775cfe2639a12f5606 (commit) via 4a68b62b86249307ade3ca5a9ca531e283ab7dcb (commit) via e89e94e01a40bbaf9e77055c6cddddba0ddbc188 (commit) via 2b84b22bad33e14227abcfab53f93100efac976f (commit) via ea7eb9a374bec4160b07b3c2315c00d9416daf7f (commit) via bf5e573926b2b007cb238afae86207e075603f1e (commit) via f8c6b6628dce66624a7a632992e6b8ab5db42c1c (commit) via 18906b7904842e8a43257b179335c600a40fe142 (commit) via 91b491debea274cc4dfc12130624935d4ebd9728 (commit) via b2a9788ec6f4be8fa6cd2d213288d5488878be47 (commit) via 4c7a17c2517510a608da853f0b6b3b8b2cae52d2 (commit) via 6d9c3fa0c2aee1bcddc414781ef5ab54873e4de8 (commit) via c35e021f374e58345bcd1b663fe3ef754bb665fa (commit) via c5342ad0d08b5ee845b5678cb8634c98d5ac95b0 (commit) via 028fd5594cd6becfdfc0820b1083729c6033e363 (commit) via 871125a68d11c26efdfa930cf29cdeb8dcc169a5 (commit) via 0d8676822deb220cb8a10f2f17799dfafba94deb (commit) via f34767f04c2cf89a6ce733109ab1645b1c76fb70 (commit) via 9e95fad02e1d8690deba91a8f30d722f039366ff (commit) from 64adeb163d7da6d75b5664cd2ee3783cadaf63d8 (commit) - Commits ----------------------------------------------- commit bbe80af457316826f56ada767d26e8c1db7f1130 Author: Eric Anholt <[EMAIL PROTECTED]> Date: Wed Jun 18 14:19:18 2008 -0700 i915: Restore the accelerated PBO pixel path functions after GEM changes. The fencing code is not required, and waiting on the fences defeated one of the purposes of the extension, which is to allow asynchronous readpixels. commit 654258a4fe5e7114022c6e02f2844fc469fcc6f3 Merge: 64adeb163d7da6d75b5664cd2ee3783cadaf63d8 cf29ab3ba075905cca786b52617d7dc993f58033 Author: Eric Anholt <[EMAIL PROTECTED]> Date: Wed Jun 18 14:07:38 2008 -0700 Merge commit 'origin/master' into drm-gem --------------------------------- _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit