Sorry for the problems caused by my commit. The arbprogparse.c code was
diverging a fair bit between master and gallium-0.1 and I thought it
would be good to sync them up. The driver fix is/was simple though.
-Brian
Oliver McFadden wrote:
> Oh, I forgot to change r300_fragprog.c. I've pushed your patch, thanks. :-)
>
>
> On 3/31/08, Markus Amsler <[EMAIL PROTECTED]> wrote:
>> Sorry for blaming you Oliver. You're right the regression was introduced
>> with
>>
>> Commit 978145a075255ae153ee05c2a037400e61558079
>> Author: Brian <[EMAIL PROTECTED]>
>> Date: Thu Mar 27 16:00:15 2008 -0600
>>
>> Set param_var->param_binding_type = PROGRAM_CONSTANT
>>
>> cherry-picked from gallium-0.1
>>
>> I thought I've tested that, but obviously I haven't.
>>
>> The attached patch fixes both problems.
>>
>> Markus Amsler wrote:
>>> Reverting 978145a075255ae153ee05c2a037400e61558079 fixes both problems.
>>>
>>>> Have you tried reverting that commit
>> 978145a075255ae153ee05c2a037400e61558079 on
>>>> the current Mesa master branch? It's possible this is the commit that
>> breaks
>>>> things, but I believe there is another bug with the default programs used
>> by
>>>> r300_{ioctl,state}.c.
>>>>
>>>> Just want to confirm this is indeed the correct commit.
>>>>
>>>>
>>>> On 3/30/08, Markus Amsler <[EMAIL PROTECTED]> wrote:
>>>>
>>>>
>>>>> 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
>>>>>
>>>>> I get some errors in Wow opengl like
>>>>>
>>>>> pc=3138*************************************
>>>>> Mesa program:
>>>>> -------------
>>>>> # Fragment Program/Shader
>>>>> 0: TEX TEMP[0], INPUT[4], texture[0], 2D;
>>>>> 1: MUL OUTPUT[0].w, INPUT[1], TEMP[0];
>>>>> 2: DP3 OUTPUT[0].xyz, TEMP[0], CONST[0];
>>>>> 3: END
>>>>> Hardware program
>>>>> ----------------
>>>>> NODE 0: alu_offset: 0, tex_offset: 0, alu_end: -1, tex_end: 0
>>>>> TEX:
>>>>> TEX t2, t0, texture[0] (00008080)
>>>>> r300_fragprog.c::t_src(): unknown SrcReg->File 7
>>>>>
>>>>> and
>>>>>
>>>>> problem in t_src_class (file=7)
>>>>>
>>>>> looks like you dont have taken
>>>>>
>>>>> commit 978145a075255ae153ee05c2a037400e61558079
>>>>> Author: Brian <[EMAIL PROTECTED]>
>>>>> Date: Thu Mar 27 16:00:15 2008 -0600
>>>>>
>>>>> Set param_var->param_binding_type = PROGRAM_CONSTANT
>>>>>
>>>>> cherry-picked from gallium-0.1
>>>>>
>>>>> into account while merging.
>>>>>
>>>>> Markus
>>>>>
>>>>>
>>
>
> -------------------------------------------------------------------------
> Check out the new SourceForge.net Marketplace.
> It's the best place to buy or sell services for
> just about anything Open Source.
> http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
> _______________________________________________
> Mesa3d-dev mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
>
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Mesa3d-dev mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
