URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc8a537c57a62a196106b592e510e4c93bd1826e Merge: 7fc75ef7d43038385b5fba73a67f1e4783b045d6 0c75854cc1650dc870e042aa66a053e70b3d4556 Author: Jakob Bornecrantz <ja...@vmware.com> Date: Wed Dec 2 14:56:56 2009 +0100
Merge branch 'mesa_7_7_branch' URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c75854cc1650dc870e042aa66a053e70b3d4556 Merge: 4598942b1b88a2a7d5af7febae7e79eedf00e385 2b5618fc5bdcbee3434f8b5aa3a31eb06fb479c0 Author: Jakob Bornecrantz <ja...@vmware.com> Date: Wed Dec 2 14:52:51 2009 +0100 Merge commit 'mesa_7_6_branch' into mesa_7_7_branch Conflicts: src/mesa/main/version.h URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b5618fc5bdcbee3434f8b5aa3a31eb06fb479c0 Author: Alex Deucher <alexdeuc...@gmail.com> Date: Thu Dec 3 11:20:40 2009 -0500 r200: fix polygon stipple fixes fdo bug 25354 Signed-off-by: Alex Deucher <alexdeuc...@gmail.com> URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3b7f93e0284bf3337f32f3ec77fde4dbcc9c283 Author: Vinson Lee <v...@vmware.com> Date: Tue Sep 8 12:31:42 2009 +0100 scons: Add Mac OS to target platform list. (cherry picked from commit 2c307c775018e5b9680de8022ddf0ce3b6f560be) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=235c0c81346c44e24909b6e48394ea62b136a36b Author: Vinson Lee <v...@vmware.com> Date: Thu Nov 19 23:56:07 2009 -0800 progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS. (cherry picked from commit b98db7bf697c3ed6e6df303e9dd66f7ac31eb3e2) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a107d36c2f290cd42e29008dec5194df55b7690 Author: Vinson Lee <v...@vmware.com> Date: Wed Nov 18 14:02:20 2009 -0800 progs/glsl: Fix trirast GLSL compilation errors on Mac OS. (cherry picked from commit 4b3ec2acf2cc2830b0907e4fb4db8bd1ff4a18e3) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b094683e7c2f14f61cf3511f286b4cea450609c8 Author: Vinson Lee <v...@vmware.com> Date: Wed Nov 18 13:50:49 2009 -0800 progs/glsl: Fix noise GLSL compilation error on Mac OS. (cherry picked from commit 0d31990b4742eccdf6ae6a3b3e16c81cc863085d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=592c8522a280898ba7a797923c0e054ac6df038f Author: Vinson Lee <v...@vmware.com> Date: Wed Nov 11 17:39:58 2009 -0800 demos/glsl: Add missing break statement to noise test. (cherry picked from commit 7dfea5c0722e9da101805c15b9dd26352816bca9) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f4d3613daa5684ff8aba75158ef7585a8005ed0 Author: Vinson Lee <v...@vmware.com> Date: Wed Nov 18 12:49:31 2009 -0800 progs/glsl: Fix multinoise GLSL compilation errors on Mac OS. (cherry picked from commit d4dc2e30dada1be425e95ba270920db6eb210982) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ed77d12b10c2ed830647bfcadfb3478b2e418d1 Author: Vinson Lee <v...@vmware.com> Date: Thu Nov 12 16:20:23 2009 -0800 progs/glsl: Add missing break statement in multinoise.c. (cherry picked from commit 43080e40aa0d34423e10f1d50aad15289b2b9aec) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=832593772dac9b83db1ed44c8654352978e756eb Author: Vinson Lee <v...@vmware.com> Date: Tue Nov 17 23:15:25 2009 -0800 progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS. (cherry picked from commit 04442841fb7e9138eb50ff692952ad7e8c3877d8) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a5cd95e243a0e8db25a8c7614c9b9fe5f116044 Author: Vinson Lee <v...@vmware.com> Date: Mon Sep 21 08:44:53 2009 -0600 progs/glsl: Include local headers before installed headers during compilation. Fixes compilation errors on platforms with insufficient older installed GL headers. (cherry picked from commit d17af7d1e19e637e29db47bd8f6e3e579760c530) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccea09cd3a3f18c28ebdc07c7fe879a59cd72f60 Author: Brian Paul <bri...@vmware.com> Date: Wed Sep 16 15:49:33 2009 -0600 progs/glsl: minor Makefile clean-ups (cherry picked from commit 4df2f7af5e9b2c00ead92fe0ae49ed8491aef1d0) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4598942b1b88a2a7d5af7febae7e79eedf00e385 Author: Eric Anholt <e...@anholt.net> Date: Wed Dec 2 13:00:15 2009 -0800 intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=db352f58fab419c475b89418cd27b35f5f5d3822 Author: Eric Anholt <e...@anholt.net> Date: Wed Dec 2 12:42:36 2009 -0800 mesa: Fix bad conversion in AL1616_REV texstore. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b47f7316dab5eb81bc7e60dc93bb5dbe824c43d4 Author: Eric Anholt <e...@anholt.net> Date: Wed Dec 2 12:15:46 2009 -0800 mesa: Fix copy'n'paste problem in al1616 texel fetch. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=67a0628ab2830371fc0a80b58aa4757c099471dc Author: Vinson Lee <v...@vmware.com> Date: Sat Nov 14 21:36:18 2009 -0800 progs: Ignore Mac OS dSYM directories. (cherry picked from commit a420056750908f7c2f9a7c18b3ab20f04e49711d) URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=908a3e56ccf2e6266ebf081e2947e2d6b24f2585 Author: Brian Paul <bri...@vmware.com> Date: Wed Dec 2 09:31:26 2009 -0700 cell: added tex_usage param to xm_surface_buffer_create() URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba97b98842ebe0178406258f29c93ca9fa415ff7 Author: Brian Paul <bri...@vmware.com> Date: Mon Nov 30 09:54:27 2009 -0700 progs/demos: remove unused glFogCoordPointer_ext var URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9f4a0bd2b0104ce5f15dcd7d1698db710330418 Author: Tom Fogal <tfo...@alumni.unh.edu> Date: Tue Nov 24 16:46:31 2009 -0700 Simplify hackery added to fix AIX build. Borrow an idiom from the GNU build system which can handle `for' loops over empty lists. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8da270a2be18849eee8a168d1c1528e96677b41 Author: Ian Romanick <ian.d.roman...@intel.com> Date: Tue Nov 24 11:59:23 2009 -0800 intel: Remove GL_NV_point_sprite from extension list i830 does not (and cannot!) support the any of the non-default GL_POINT_SPRITE_R_MODE_NV settings. i915 and i965 could, but currently do not. In both cases it would require mucking about with the fragment shader. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=77ff3a5619721cfd917f9fd45e4b3a1c866c578f Author: Jakob Bornecrantz <ja...@vmware.com> Date: Tue Dec 1 17:13:41 2009 +0100 vmware/xorg: Add video support By using the hooks st/xorg provides us we can create a driver specific implementation that uses the svga overlay engines. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=64102a56256c95f17f59456a78d9ff2b05889bfb Author: Jakob Bornecrantz <ja...@vmware.com> Date: Tue Nov 24 23:51:05 2009 +0100 vmware/xorg: Create a small driver that sits ontop of st/xorg URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb80a93c9eabb430914011513852b18c943c8cfa Author: Jakob Bornecrantz <ja...@vmware.com> Date: Tue Nov 24 22:55:24 2009 +0100 st/xorg: Create winsys hooks that we call into URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=232e59ca6fe678ac370ee5a45bc31e6f7f3e6bcf Author: Jakob Bornecrantz <ja...@vmware.com> Date: Tue Dec 1 17:00:43 2009 +0100 vmware/core: Update vmwgfx_drm.h to latest version URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9077ddaa2557e1e76c8a052c8d079ef3d443186b Author: Jakob Bornecrantz <ja...@vmware.com> Date: Wed Nov 25 00:33:43 2009 +0100 svga: Add header files for overlay support URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a7e4a311e971005f7b23572ff3ca93f6d3c17edf Author: Eric Anholt <e...@anholt.net> Date: Wed Dec 2 11:56:18 2009 -0800 intel: Fix more front-buffer rendering after Brian's less flushing patch. bcbfda71b03303d3f008a6f3cf8cb7d9667bf8d2 left out many blit paths. This fixes up more of them to get Blender to work again. Bug #25030. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b2581dcab41c142c38f2e065c4348cb892931c48 Author: José Fonseca <jfons...@vmware.com> Date: Wed Dec 2 17:05:20 2009 +0000 wgl: Call st_swapbuffers instead of st_notify_swapbuffers. This will get single buffer, double buffer, and joint single/double buffer (typical in CAD applications) done right, at least as far as the frambuffer is concerned. There are still problems with multiple contexts using the same framebuffer because st_framebuffer_* calls assume the framebuffer is bound to a single context. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e84dddde9b6eb7727760814ae211c95218bb28a3 Author: Dave Airlie <airl...@redhat.com> Date: Wed Dec 2 11:01:19 2009 +1000 Revert "radeon/r300: no need to flush the cmdbuf when changing scissors state in KMM mode" This reverts commit 286bf89e5a1fc931dbf523ded861b809859485e2. This doesn't appear to be correct, regression so revert it. http://bugs.freedesktop.org/show_bug.cgi?id=25193 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8cdce665790263bb2142d894a81c87abc4da9fb Author: Brian Paul <bri...@vmware.com> Date: Tue Dec 1 13:26:15 2009 -0700 vbo: make flush recursion check code per-context This fixes invalid failed assertions when running multi-threaded apps. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8c26cefec7ad52c4fa52fd1a89e18f463b85257b Author: Brian Paul <bri...@vmware.com> Date: Mon Nov 30 08:41:37 2009 -0700 st/mesa: updated emit_swz() comment URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=910aaed4daad319b584b68ae2468432c8f6bac21 Author: Ian Romanick <ian.d.roman...@intel.com> Date: Mon Nov 30 17:55:21 2009 -0800 mesa: set version string to 7.6.1-rc2 _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit