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.com>wrote:
> 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 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 --with-state-trackers=dri,egl,xorg,glx,vega,es
> > --enable-motif --enable-gl-osmesa --disable-gallium-intel
> > --disable-gallium-radeon --with-expat=/usr/lib
> > --with-demos=xdemos,demos,trivial,tests --with-dri-drivers=swrast
> > --enable-gallium-swrast --enable-gallium-svga --with-max-width=4096
> > --with-max-height=4096 --enable-debug.
> >
> > I've used both gmake and make after ./configure,and Mesa keeps hitting
> this
> > error when it tries to build the svga state-tracker:
> >
> > gmake[4]: Entering directory `/opt/mesa/src/gallium/drivers/svga'
> > rm -f depend
> > touch depend
> > /usr/bin/makedepend -fdepend
> -I/usr/lib/gcc/i686-redhat-linux/4.4.3/include
> > -I. -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary
> > -I../../../../src/gallium/drivers
> > -I../../../../src/gallium/drivers/svga/include -std=gnu99
> > -fvisibility=hidden -DHAVE_STDINT_H -DHAVE_SYS_TYPES_H
> > svgadump/svga_shader_dump.c svgadump/svga_shader_op.c
> svgadump/svga_dump.c
> > svga_cmd.c svga_context.c svga_draw.c svga_draw_arrays.c
> > svga_draw_elements.c svga_pipe_blend.c svga_pipe_blit.c svga_pipe_clear.c
> > svga_pipe_constants.c svga_pipe_depthstencil.c svga_pipe_draw.c
> > svga_pipe_flush.c svga_pipe_fs.c svga_pipe_misc.c svga_pipe_query.c
> > svga_pipe_rasterizer.c svga_pipe_sampler.c svga_pipe_vertex.c
> svga_pipe_vs.c
> > svga_screen.c svga_screen_buffer.c svga_screen_texture.c
> svga_screen_cache.c
> > svga_state.c svga_state_need_swtnl.c svga_state_constants.c
> > svga_state_framebuffer.c svga_state_rss.c svga_state_tss.c
> > svga_state_vdecl.c svga_state_fs.c svga_state_vs.c svga_swtnl_backend.c
> > svga_swtnl_draw.c svga_swtnl_state.c svga_tgsi.c svga_tgsi_decl_sm20.c
> > svga_tgsi_decl_sm30.c svga_tgsi_insn.c 2> /dev/null
> > gmake[4]: *** No rule to make target `depend', needed by `default'.
> Stop.
> > gmake[4]: Leaving directory `/opt/mesa/src/gallium/drivers/svga'
> > gmake[3]: *** [default] Error 1
> > gmake[3]: Leaving directory `/opt/mesa/src/gallium/drivers'
> > gmake[2]: *** [default] Error 1
> > gmake[2]: Leaving directory `/opt/mesa/src/gallium'
> > make[1]: *** [subdirs] Error 1
> > make[1]: Leaving directory `/opt/mesa/src'
> > make: *** [default] Error 1
> > Regards,
> > STEVE555
> >
> >
> > Sedat Dilek wrote:
> >>
> >> 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
> >>>> s...@seduxbox:~/src/anholt_oa-benchmark$ openarena +exec anholt 2>&1 |
> >>>> egrep -e '[0-9]+ frames'
> >>>> 840 frames 26.3 seconds 31.9 fps 9.0/31.3/90.0/9.9 ms
> >>>> Thanks for your work!
> >>> Unless I have some magic power that I am not aware of, the boost should
> >>> be
> >>> attributed to r300g developers.
> >>>
> >>
> >> I think, it is helpful to benchmark from time to time.
> >> I was comparing the both branches 7.8 and 7.9-devel in general and
> >> especiall r300g dri/st.
> >> Indeed, Chapeau to all contributors to r300g development.
> >>
> >> --
> >> Sedat
> >>
> >>
> ------------------------------------------------------------------------------
> >> 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/New-branch-to-switch-st-dri-to-st_api.h-tp27940955p27975796.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
>
------------------------------------------------------------------------------
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