Hi keith,
Thank you very much for putting my mind at rest.I have to admit
I was sweating a bit,lol! I'm might try out the gallium-sampler-view branch
a bit later.
Regards,
STEVE555
Keith Whitwell-4 wrote:
>
> I actually merged the sw-api-2 branch to master & then deleted the
> branch. Sorry if I surprised you - just trying to avoid having
> hundreds of old, dead branches cluttering up the repository. Usually
> after a few weeks go by it's hard to remember which branches are still
> active and which can be deleted.
>
> I'll push the fix tomorrow from work.
>
> Keith
>
> On Thu, Mar 11, 2010 at 9:58 PM, STEVE555 <stevenward...@hotmail.com>
> wrote:
>>
>> Hi guys,
>> I applied the patch using git apply on the Mesa master branch
>> (I
>> was getting the same on there also),for some reason,Kompare wasn't doing
>> it's job properly. The reason I did it on there was because I looked at
>> the
>> branches on cgit,and Keith's gallium-sw-api-2 branch has disappeared! I'm
>> extremeley sorry if I deleted it,or merged it into master by accident
>> like I
>> did earlier.I genuinely thought I was doing that sort of thing on my
>> local
>> copy of his branch.
>> The good news is that when I re-compiled my local copy of Mesa master
>> with
>> the patch applied,it all compiled fine,with no ill effects when I
>> re-booted.
>> Regards,
>> STEVE555
>>
>> Dan Nicholson-2 wrote:
>>>
>>> On Thu, Mar 11, 2010 at 12:23 PM, Dan Nicholson <dbn.li...@gmail.com>
>>> wrote:
>>>> On Thu, Mar 11, 2010 at 12:19 PM, STEVE555 <stevenward...@hotmail.com>
>>>> wrote:
>>>>>
>>>>> Hi Keith,
>>>>> Here's what I did.I opened Konsole on my mesa folder.I did
>>>>> a
>>>>> git
>>>>> pull origin to get the latest commits from master,then I did a git
>>>>> checkout
>>>>> -b gallium-sw-api-2 origin/gallium-sw-api-2 to get your branch again(I
>>>>> deleted it earlier) .I then switched to the gallium-sw-api-2 using git
>>>>> branch and then did a git merge master.I saved your patch in a txt
>>>>> file,and
>>>>> then renamed it as gallium-sw-api-2.patch,I then used Kompare to apply
>>>>> and
>>>>> save all the differences.
>>>>> I then did a gmake -B realclean and then I used the same configure
>>>>> options
>>>>> as before.
>>>>> Unfortunately,your patch didn't work,I still get the same error as
>>>>> before.
>>>>
>>>> You would actually need to run autoconf first to generate a new
>>>> configure script with Keith's changes.
>>>
>>> Or just run ./autogen.sh with the arguments you normally pass to
>>> configure.
>>>
>>> --
>>> Dan
>>>
>>> ------------------------------------------------------------------------------
>>> Download Intel® Parallel Studio Eval
>>> Try the new software tools for yourself. Speed compiling, find bugs
>>> proactively, and fine-tune applications for parallel performance.
>>> See why Intel Parallel Studio got high marks during beta.
>>> http://p.sf.net/sfu/intel-sw-dev
>>> _______________________________________________
>>> Mesa3d-dev mailing list
>>> Mesa3d-dev@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
>>>
>>>
>>
>> --
>> View this message in context:
>> http://old.nabble.com/sw-api-2-branch-tp27841684p27870463.html
>> Sent from the mesa3d-dev mailing list archive at Nabble.com.
>>
>>
>> ------------------------------------------------------------------------------
>> Download Intel® Parallel Studio Eval
>> Try the new software tools for yourself. Speed compiling, find bugs
>> proactively, and fine-tune applications for parallel performance.
>> See why Intel Parallel Studio got high marks during beta.
>> http://p.sf.net/sfu/intel-sw-dev
>> _______________________________________________
>> Mesa3d-dev mailing list
>> Mesa3d-dev@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
>>
>
> ------------------------------------------------------------------------------
> Download Intel® Parallel Studio Eval
> Try the new software tools for yourself. Speed compiling, find bugs
> proactively, and fine-tune applications for parallel performance.
> See why Intel Parallel Studio got high marks during beta.
> http://p.sf.net/sfu/intel-sw-dev
> _______________________________________________
> Mesa3d-dev mailing list
> Mesa3d-dev@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
>
>
--
View this message in context:
http://old.nabble.com/sw-api-2-branch-tp27841684p27870709.html
Sent from the mesa3d-dev mailing list archive at Nabble.com.
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
