Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread Chia-I Wu
Hi all, On Thu, Mar 18, 2010 at 10:11:12AM +0800, Chia-I Wu wrote: I've created a new branch, gallium-st-api-dri, that switches st/dri from st_public.h to st_api.h. The branch starts with four commits that move DRI1 support to a new file, followed by 2 commits to switch st/dri to st_api.h.

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread Sedat Dilek
Hi Chia-I (hope this is the first name), I've merged the branch. All Gallium DRI drivers now use st_api.h instead of st_public.h. If you notice any regression due the merge, please let me know so that I can work on it. The last days I have tested your gallium-st-api-dri GIT branch by merging

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread Chia-I Wu
On Sun, Mar 21, 2010 at 5:19 PM, Sedat Dilek sedat.di...@googlemail.com wrote: Hi Chia-I (hope this is the first name), It is :) I've merged the branch.  All Gallium DRI drivers now use st_api.h instead of st_public.h.  If you notice any regression due the merge, please let me know so that I can

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread Sedat Dilek
On Sun, Mar 21, 2010 at 10:33 AM, Chia-I Wu olva...@gmail.com wrote: On Sun, Mar 21, 2010 at 5:19 PM, Sedat Dilek sedat.di...@googlemail.com wrote: [...] Even I see OpenArena got a boost from ~25fps (7.8 GIT) to ~32fps (master GIT incl. gallium-st-api-dri merge) $ cat oa_benchmark.txt

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread STEVE555
Hi Chia-I Wu, I've just updated my copy of Mesa master today after your merge and the latest commits(from about 11:30 am GMT).I build Mesa with these configure options: ./configure --prefix=/usr --enable-32-bit --enable-xcb --enable-gallium-nouveau

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread Sedat Dilek
Maybe you try a git-hard-reset to the commit-no of the merge and then compile again. (To see if it is related to gallium-st-api-dri merge) $ git reset --hard 12deb9e6ca76d222badf71c8643e84640673e86d -- Sedat -- Download

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread George Sapountzis
That was commit 9ec29e31919e85f9230867f43841c0e74be930d3 when doing a pristine build. I reverted it for now. On Sun, Mar 21, 2010 at 2:31 PM, STEVE555 stevenward...@hotmail.com wrote: Hi Chia-I Wu,                   I've just updated my copy of Mesa master today after your merge and the

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread Chia-I Wu
On Sun, Mar 21, 2010 at 8:31 PM, STEVE555 stevenward...@hotmail.com wrote:                   I've just updated my copy of Mesa master today after your merge and the latest commits(from about 11:30 am GMT).I build Mesa with these configure options: ./configure --prefix=/usr --enable-32-bit

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread Marek Olšák
Please do git pull --rebase origin instead of git pull origin to avoid Merge branch 'master' of ... commits. -Marek On Sun, Mar 21, 2010 at 2:40 PM, George Sapountzis gsapount...@gmail.comwrote: That was commit 9ec29e31919e85f9230867f43841c0e74be930d3 when doing a pristine build. I reverted

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread George Sapountzis
On Sun, Mar 21, 2010 at 4:31 PM, Marek Olšák mar...@gmail.com wrote: Please do git pull --rebase origin instead of git pull origin to avoid Merge branch 'master' of ... commits. yes, i left them because the intervening commits happened between a local 'git clean -fdx' and a 'git push' ... to

Re: [Mesa3d-dev] New branch to switch st/dri to st_api.h

2010-03-21 Thread STEVE555
Hi George, Your revert commit fixed the probelm,thank you very much indeed. Regards, STEVE555 George Sapountzis wrote: On Sun, Mar 21, 2010 at 4:31 PM, Marek Olšák mar...@gmail.com wrote: Please do git pull --rebase origin instead of git pull origin to avoid