URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9136c9b29ed5c14bc89a4c4e3a391e0b097092e1 Merge: ce8469abeb8d48d84a77f3ddd1664d9f98d7d620 5f36c5b2c59bb8be53d3712b3896b448ef086c74 Author: José Fonseca <jfons...@vmware.com> Date: Mon Dec 22 19:31:52 2008 +0000
Merge commit 'origin/gallium-0.1' into gallium-0.2 Conflicts: src/gallium/auxiliary/util/Makefile URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f36c5b2c59bb8be53d3712b3896b448ef086c74 Author: Jerome Glisse <gli...@freedesktop.org> Date: Thu Dec 18 19:56:45 2008 +0100 softpipe: initialize refcount and winsys URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85bc49a6f17fb3909c3d5e7200114c3bb58c9019 Author: Jerome Glisse <gli...@freedesktop.org> Date: Thu Dec 18 13:34:27 2008 +0100 softpipe: convert to use texture instead of surface URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ae7e75d6108e8621878083b35a13edc1aca893df Author: José Fonseca <jfons...@vmware.com> Date: Mon Dec 22 16:55:27 2008 +0000 gallium: const correctness. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=229424b2d79f7ab19c6799795df155c265e3f258 Author: José Fonseca <jfons...@vmware.com> Date: Sun Dec 21 13:48:43 2008 +0000 Ignore new tests executables. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9127a03bcbef27ed3cfc36d370969b430870fa0e Author: José Fonseca <jfons...@vmware.com> Date: Sat Dec 20 12:59:51 2008 +0000 gallium: Fix typo in define name. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b901e1f212c11afda05f2628a522d86802f87c52 Author: José Fonseca <jfons...@vmware.com> Date: Fri Dec 19 20:06:11 2008 +0000 gallium: Simple and efficient cache. Fixed size hash table. Collisions are handled by simply destroying the previous entry. It hasn't received much testing yet. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=030a7a320cb2c49ff60f3948bd9c4976ca0b0b17 Author: Brian Paul <bri...@vmware.com> Date: Fri Dec 19 07:33:17 2008 -0700 gallium: replace #elif with #else URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=59a168d5c9b5f478e4e8bedcd8522e359e98987e Author: Brian Paul <bri...@vmware.com> Date: Thu Dec 18 18:06:38 2008 -0700 tgsi: scan for additional info: uses_fogcoord, uses_frontfacing URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=78a204f507f966d12ecd3931a51a85763c66ddb3 Author: Brian Paul <brian.p...@tungstengraphics.com> Date: Thu Dec 18 16:00:20 2008 -0700 gallium: fix two-sided lighting test in state tracker This fixes two-sided lighting for vertex shaders. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=36c7bb697d47560e2bf4798db11afd7f1751abef Author: Robert Ellison <papi...@tungstengraphics.com> Date: Thu Dec 18 09:46:53 2008 -0700 Gallium: fix for conform test The following construction in util_surface_copy() in gallium/auxiliary/util/u_rect.c, introduced in commit d177c9ddda2c452cf7d6696d89cf4458ef986f98, incorrectly inverts the Y coordinate in the last parameter to pipe_copy_rect(). /* If do_flip, invert src_y position and pass negative src stride */ pipe_copy_rect(dst_map, &dst->block, dst->stride, dst_x, dst_y, w, h, src_map, do_flip ? -(int) src->stride : src->stride, src_x, do_flip ? w - src_y : src_y); The intention is to start at the last Y coordinate line and move backwards, in the case of a flip; in that case, the correct calculation is "src_y + h - 1", not "w - src_y". This fixes a Gallium assertion failure in the conformance tests: u_rect.c:65:pipe_copy_rect: Assertion `src_y >= 0' failed. debug_get_bool_option: GALLIUM_ABORT_ON_ASSERT = TRUE Trace/breakpoint trap URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=97d08366aa2a56705d32806845134cb4b5edbff0 Author: Michal Krol <mic...@tungstengraphics.com> Date: Thu Dec 18 18:45:32 2008 +0100 glsl: Fix handling of nested parens in macro actual arguments. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a402d48f840f1d51eb46dc15a047589e2b8ca431 Author: Eric Anholt <e...@anholt.net> Date: Tue Oct 7 18:47:31 2008 -0700 mesa: Pass the context to query object delete cb to avoid null dereference. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=92dc8ffa719276fe536abf4dcf7874cf12588f60 Author: José Fonseca <jrfons...@tungstengraphics.com> Date: Thu Dec 18 14:53:24 2008 +0000 gallium: Enable memory debugging on all windows platforms. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9c76750a7687e9902f2efd91d5551ae0128003c Author: Brian Paul <brian.p...@tungstengraphics.com> Date: Wed Dec 17 19:01:34 2008 -0700 mesa: choose GLSL vertex shader over ARB/internal vertex program in get_fp_input_mask() This is a work-around the for the fact that we do fragment shader state validation before vertex shader validation (see comments in state.c) so in get_fp_input_mask() we can't rely on ctx->VertexProgram._Current being up to date yet. This fixes a glean glsl1 test failure. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b890fffbf4ad435ef533988d288e98b0bfe4d17b Author: Brian Paul <brian.p...@tungstengraphics.com> Date: Wed Dec 17 18:52:10 2008 -0700 gallium: fix memory corruption in u_gen_mipmap.c Remove the old/initial vbuf allocation in util_create_gen_mipmap(). We were allocating a small vbuf at this point so get_next_slot() didn't have as large of buffer as it expected. So all but the first set_vertex_data() was writing out of bounds. Also added some comments. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=947d04d08bead28c43f525ea4c1d99a039bed047 Author: Brian Paul <brian.p...@tungstengraphics.com> Date: Wed Dec 17 14:04:03 2008 -0700 mesa: fix fixed-function test in get_fp_input_mask() - again. The problem we're solving only occured when there was a user-defined vertex shader but no fragment shader. Check for that case now. Fixes glean api2 vertex array failure. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=35bb2aa96a2499860869c0d307b599b3033b5264 Author: Brian Paul <brian.p...@tungstengraphics.com> Date: Wed Dec 17 13:17:15 2008 -0700 mesa: add missing cases for texture array targets URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a8751f49167df81611390377aa3e84aba1ed3ae3 Author: Brian Paul <brian.p...@tungstengraphics.com> Date: Wed Dec 17 11:29:42 2008 -0700 Revert "mesa: fix vertex program test in get_fp_input_mask()" This reverts commit cdaaf8e107010624bed4abdf9553c0ef63c8b708. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cdaaf8e107010624bed4abdf9553c0ef63c8b708 Author: Brian Paul <brian.p...@tungstengraphics.com> Date: Wed Dec 17 10:55:40 2008 -0700 mesa: fix vertex program test in get_fp_input_mask() We were accidentally using the fixed-function logic when a vertex shader was being used. URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a299851b9ee06fafc03cf4dc7d26023bac17f69 Author: Brian Paul <brian.p...@tungstengraphics.com> Date: Wed Dec 17 10:55:29 2008 -0700 winsys: fix depth buffer size when using stencil URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=95ce6474f46e86d5511117cc5bbb2702b2469f5c Author: Michal Krol <mic...@tungstengraphics.com> Date: Mon Dec 15 12:29:34 2008 +0100 gallium: Fix PIPE_FORMAT_X8B8G8R8_SNORM definition. _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit