Chia-I Wu wrote on 2010-01-15 15:09:
> On Fri, Jan 15, 2010 at 09:57:32PM +0800, Chia-I Wu wrote:
>
>> On Wed, Jan 13, 2010 at 2:02 AM, michal <mic...@vmware.com> wrote:
>>
>>> I would like to merge this branch to master soon.
>>>
>> I am seeing all sorts of funny behaviors after the merge with OpenVG. The
>> attached patch seems to fix the problem. I am not sure if this is the right
>> fix...
>>
> There are two typos in the changes to auxiliary/vl/. Here is the
> updated patch. Sorry for the trouble.
>
>
The patch does not apply.
/c/src/mesa (master)
$ git am 0001-gallium-Fix-uninitialized-instance-divisor-and-index-v2.patch
Applying: gallium: Fix uninitialized instance divisor and index.
c:/src/mesa/.git/rebase-apply/patch:18: trailing whitespace.
unsigned instance_id_index = ~0;
c:/src/mesa/.git/rebase-apply/patch:30: trailing whitespace.
velements[i].instance_divisor = 0;
c:/src/mesa/.git/rebase-apply/patch:42: trailing whitespace.
c->vertex_elems[0].instance_divisor = 0;
c:/src/mesa/.git/rebase-apply/patch:50: trailing whitespace.
c->vertex_elems[1].instance_divisor = 0;
c:/src/mesa/.git/rebase-apply/patch:62: trailing whitespace.
r->vertex_elems[0].instance_divisor = 0;
error: patch failed:
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c:6
0
error: src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c: patch
does not
apply
error: patch failed: src/gallium/auxiliary/util/u_draw_quad.c:61
error: src/gallium/auxiliary/util/u_draw_quad.c: patch does not apply
error: patch failed: src/gallium/auxiliary/vl/vl_compositor.c:316
error: src/gallium/auxiliary/vl/vl_compositor.c: patch does not apply
error: patch failed: src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c:891
error: src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c: patch does not
apply
error: patch failed: src/gallium/state_trackers/vega/polygon.c:293
error: src/gallium/state_trackers/vega/polygon.c: patch does not apply
Patch failed at 0001 gallium: Fix uninitialized instance divisor and index.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
I think I will try to manually patch it later. Thanks!
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
