From: Keith W. <ke...@vm...> - 2010-03-09 20:47:06
|
This has reached a point where I could think about merging it. There is plenty more cleanup to do, but the branch makes some big strides and introduces a couple of concepts that I've wanted for a long time. In particular the idea of a designated "targets" subtree which has code for explicitly constructing driver stacks. Secondly the ability to inject layers into (at least) the software stacks has been greatly improved, and I'd like to see us build on that for hardware drivers as well. There is probably still some bugfix to come, but if you're interested in the software rasterizers, please check out this branch and let me know how much I've broken things... Keith |
From: STEVE555 <ste...@ho...> - 2010-03-10 00:49:55
|
Dear Keith, I've downloaded your sw-api-2 branch using the .tar.gz method again(git just won't let me).I used the same ./configure options but with the exception of doing --prefix=/usr/local instaed od /usr just in case. It was compiling fine until it hit this error: gmake[4]: Entering directory `/opt/mesa-gallium-sw-api-2/src/gallium/drivers/nv30' gcc -c -I. -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary -I../../../../src/gallium/drivers -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 nv30_clear.c -o nv30_clear.o gcc -c -I. -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary -I../../../../src/gallium/drivers -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 nv30_context.c -o nv30_context.o gcc -c -I. -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary -I../../../../src/gallium/drivers -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 nv30_draw.c -o nv30_draw.o gcc -c -I. -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary -I../../../../src/gallium/drivers -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 nv30_fragprog.c -o nv30_fragprog.o gcc -c -I. -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary -I../../../../src/gallium/drivers -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 nv30_fragtex.c -o nv30_fragtex.o gcc -c -I. -I../../../../src/gallium/include -I../../../../src/gallium/auxiliary -I../../../../src/gallium/drivers -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 nv30_miptree.c -o nv30_miptree.o nv30_miptree.c: In function ‘nv30_screen_init_miptree_functions’: nv30_miptree.c:239: error: ‘nv50_miptree_blanket’ undeclared (first use in this function) nv30_miptree.c:239: error: (Each undeclared identifier is reported only once nv30_miptree.c:239: error: for each function it appears in.) gmake[4]: *** [nv30_miptree.o] Error 1 gmake[4]: Leaving directory `/opt/mesa-gallium-sw-api-2/src/gallium/drivers/nv30' gmake[3]: *** [default] Error 1 gmake[3]: Leaving directory `/opt/mesa-gallium-sw-api-2/src/gallium/drivers' gmake[2]: *** [default] Error 1 gmake[2]: Leaving directory `/opt/mesa-gallium-sw-api-2/src/gallium' gmake[1]: *** [subdirs] Error 1 gmake[1]: Leaving directory `/opt/mesa-gallium-sw-api-2/src' gmake: *** [default] Error 1 Regards, STEVE555 Keith Whitwell-3 wrote: > > This has reached a point where I could think about merging it. There is > plenty more cleanup to do, but the branch makes some big strides and > introduces a couple of concepts that I've wanted for a long time. > > In particular the idea of a designated "targets" subtree which has code > for explicitly constructing driver stacks. > > Secondly the ability to inject layers into (at least) the software > stacks has been greatly improved, and I'd like to see us build on that > for hardware drivers as well. > > There is probably still some bugfix to come, but if you're interested in > the software rasterizers, please check out this branch and let me know > how much I've broken things... > > Keith > > > ------------------------------------------------------------------------------ > 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 > Mes...@li... > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > > -- View this message in context: http://old.nabble.com/sw-api-2-branch-tp27841684p27844205.html Sent from the mesa3d-dev mailing list archive at Nabble.com. |
From: Keith W. <ke...@vm...> - 2010-03-10 08:35:42
|
On Tue, 2010-03-09 at 16:49 -0800, STEVE555 wrote: > Dear Keith, > I've downloaded your sw-api-2 branch using the .tar.gz > method again(git just won't let me).I used the same ./configure options but > with the exception of doing --prefix=/usr/local instaed od /usr just in > case. > It was compiling fine until it hit this error: Ugh, should be fixed by the merge from master. Keith |
From: STEVE555 <ste...@ho...> - 2010-03-10 12:41:59
|
Dear Keith, I checked out your branch using git checkout -b.and used git pull to get the differences between your branch and master.I did a gmake -B realclean and used my ./configure options I use for master. Unfortunately,it has stopped compiling with this error: /usr/bin/install -c vmwgfx_dri.so ../../../../../../lib/gallium gmake[5]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware/dri' gmake[5]: Entering directory `/opt/mesa/src/gallium/winsys/drm/vmware/egl' gcc -c -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 -D_GNU_SOURCE -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 dummy.c -o dummy.o gmake[5]: *** No rule to make target `../../../../../../src/gallium/winsys/xlib/libws_xlib.a', needed by `egl_x11_vmwgfx.so'. Stop. gmake[5]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware/egl' gmake[4]: *** [default] Error 1 gmake[4]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware' gmake[3]: *** [default] Error 1 gmake[3]: Leaving directory `/opt/mesa/src/gallium/winsys/drm' gmake[2]: *** [default] Error 1 gmake[2]: Leaving directory `/opt/mesa/src/gallium/winsys' gmake[1]: *** [subdirs] Error 1 gmake[1]: Leaving directory `/opt/mesa/src' gmake: *** [default] Error 1 Regards, STEVE555 Keith Whitwell-3 wrote: > > This has reached a point where I could think about merging it. There is > plenty more cleanup to do, but the branch makes some big strides and > introduces a couple of concepts that I've wanted for a long time. > > In particular the idea of a designated "targets" subtree which has code > for explicitly constructing driver stacks. > > Secondly the ability to inject layers into (at least) the software > stacks has been greatly improved, and I'd like to see us build on that > for hardware drivers as well. > > There is probably still some bugfix to come, but if you're interested in > the software rasterizers, please check out this branch and let me know > how much I've broken things... > > Keith > > > ------------------------------------------------------------------------------ > 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 > Mes...@li... > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > > -- View this message in context: http://old.nabble.com/sw-api-2-branch-tp27841684p27849102.html Sent from the mesa3d-dev mailing list archive at Nabble.com. |
From: Keith W. <ke...@vm...> - 2010-03-10 13:15:24
|
Steve, What configure options are those? Keith On Wed, 2010-03-10 at 04:41 -0800, STEVE555 wrote: > Dear Keith, > I checked out your branch using git checkout -b.and used git > pull to get the differences between your branch and master.I did a gmake -B > realclean and used my ./configure options I use for master. > Unfortunately,it has stopped compiling with this error: > > /usr/bin/install -c vmwgfx_dri.so ../../../../../../lib/gallium > gmake[5]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware/dri' > gmake[5]: Entering directory `/opt/mesa/src/gallium/winsys/drm/vmware/egl' > gcc -c -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math > -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 -DUSE_X86_ASM > -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS -DDEBUG > -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER > -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS > -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 -D_GNU_SOURCE > -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 > -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS > -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 dummy.c -o dummy.o > gmake[5]: *** No rule to make target > `../../../../../../src/gallium/winsys/xlib/libws_xlib.a', needed by > `egl_x11_vmwgfx.so'. Stop. > gmake[5]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware/egl' > gmake[4]: *** [default] Error 1 > gmake[4]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware' > gmake[3]: *** [default] Error 1 > gmake[3]: Leaving directory `/opt/mesa/src/gallium/winsys/drm' > gmake[2]: *** [default] Error 1 > gmake[2]: Leaving directory `/opt/mesa/src/gallium/winsys' > gmake[1]: *** [subdirs] Error 1 > gmake[1]: Leaving directory `/opt/mesa/src' > gmake: *** [default] Error 1 > > Regards, > STEVE555 > > > Keith Whitwell-3 wrote: > > > > This has reached a point where I could think about merging it. There is > > plenty more cleanup to do, but the branch makes some big strides and > > introduces a couple of concepts that I've wanted for a long time. > > > > In particular the idea of a designated "targets" subtree which has code > > for explicitly constructing driver stacks. > > > > Secondly the ability to inject layers into (at least) the software > > stacks has been greatly improved, and I'd like to see us build on that > > for hardware drivers as well. > > > > There is probably still some bugfix to come, but if you're interested in > > the software rasterizers, please check out this branch and let me know > > how much I've broken things... > > > > Keith > > > > > > ------------------------------------------------------------------------------ > > 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 > > Mes...@li... > > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > > > > > |
From: Keith W. <ke...@vm...> - 2010-03-11 14:41:32
Attachments:
diff
|
Steve, Does the attached patch help for you? Keith On Wed, 2010-03-10 at 05:34 -0800, STEVE555 wrote: > Hi Keith, > I use 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 --ernable-debug > > I sometimes use --with-max-width= and --with-max-height= but the rest of > them generally stay the same. > > Regards, > STEVE555 > > > Keith Whitwell-3 wrote: > > > > Steve, > > > > What configure options are those? > > > > Keith > > > > On Wed, 2010-03-10 at 04:41 -0800, STEVE555 wrote: > >> Dear Keith, > >> I checked out your branch using git checkout -b.and used > >> git > >> pull to get the differences between your branch and master.I did a gmake > >> -B > >> realclean and used my ./configure options I use for master. > >> Unfortunately,it has stopped compiling with this error: > >> > >> /usr/bin/install -c vmwgfx_dri.so ../../../../../../lib/gallium > >> gmake[5]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware/dri' > >> gmake[5]: Entering directory > >> `/opt/mesa/src/gallium/winsys/drm/vmware/egl' > >> gcc -c -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math > >> -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 > >> -DUSE_X86_ASM > >> -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS > >> -DDEBUG > >> -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER > >> -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS > >> -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 -D_GNU_SOURCE > >> -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB > >> -DUSE_EXTERNAL_DXTN_LIB=1 > >> -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING > >> -DHAVE_ALIAS > >> -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 dummy.c -o dummy.o > >> gmake[5]: *** No rule to make target > >> `../../../../../../src/gallium/winsys/xlib/libws_xlib.a', needed by > >> `egl_x11_vmwgfx.so'. Stop. > >> gmake[5]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware/egl' > >> gmake[4]: *** [default] Error 1 > >> gmake[4]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware' > >> gmake[3]: *** [default] Error 1 > >> gmake[3]: Leaving directory `/opt/mesa/src/gallium/winsys/drm' > >> gmake[2]: *** [default] Error 1 > >> gmake[2]: Leaving directory `/opt/mesa/src/gallium/winsys' > >> gmake[1]: *** [subdirs] Error 1 > >> gmake[1]: Leaving directory `/opt/mesa/src' > >> gmake: *** [default] Error 1 > >> > >> Regards, > >> STEVE555 > >> > >> > >> Keith Whitwell-3 wrote: > >> > > >> > This has reached a point where I could think about merging it. There > >> is > >> > plenty more cleanup to do, but the branch makes some big strides and > >> > introduces a couple of concepts that I've wanted for a long time. > >> > > >> > In particular the idea of a designated "targets" subtree which has code > >> > for explicitly constructing driver stacks. > >> > > >> > Secondly the ability to inject layers into (at least) the software > >> > stacks has been greatly improved, and I'd like to see us build on that > >> > for hardware drivers as well. > >> > > >> > There is probably still some bugfix to come, but if you're interested > >> in > >> > the software rasterizers, please check out this branch and let me know > >> > how much I've broken things... > >> > > >> > Keith > >> > > >> > > >> > > >> ------------------------------------------------------------------------------ > >> > 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 > >> > Mes...@li... > >> > 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 > > Mes...@li... > > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > > > > > |
From: STEVE555 <ste...@ho...> - 2010-03-11 20:19:46
|
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. Regards, Steve Keith Whitwell-3 wrote: > > Steve, > > Does the attached patch help for you? > > Keith > > On Wed, 2010-03-10 at 05:34 -0800, STEVE555 wrote: >> Hi Keith, >> I use 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 --ernable-debug >> >> I sometimes use --with-max-width= and --with-max-height= but the rest of >> them generally stay the same. >> >> Regards, >> STEVE555 >> >> >> Keith Whitwell-3 wrote: >> > >> > Steve, >> > >> > What configure options are those? >> > >> > Keith >> > >> > On Wed, 2010-03-10 at 04:41 -0800, STEVE555 wrote: >> >> Dear Keith, >> >> I checked out your branch using git checkout -b.and >> used >> >> git >> >> pull to get the differences between your branch and master.I did a >> gmake >> >> -B >> >> realclean and used my ./configure options I use for master. >> >> Unfortunately,it has stopped compiling with this error: >> >> >> >> /usr/bin/install -c vmwgfx_dri.so ../../../../../../lib/gallium >> >> gmake[5]: Leaving directory >> `/opt/mesa/src/gallium/winsys/drm/vmware/dri' >> >> gmake[5]: Entering directory >> >> `/opt/mesa/src/gallium/winsys/drm/vmware/egl' >> >> gcc -c -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math >> >> -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 >> >> -DUSE_X86_ASM >> >> -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS >> >> -DDEBUG >> >> -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 >> -DIN_DRI_DRIVER >> >> -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS >> >> -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 -D_GNU_SOURCE >> >> -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB >> >> -DUSE_EXTERNAL_DXTN_LIB=1 >> >> -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING >> >> -DHAVE_ALIAS >> >> -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 dummy.c -o >> dummy.o >> >> gmake[5]: *** No rule to make target >> >> `../../../../../../src/gallium/winsys/xlib/libws_xlib.a', needed by >> >> `egl_x11_vmwgfx.so'. Stop. >> >> gmake[5]: Leaving directory >> `/opt/mesa/src/gallium/winsys/drm/vmware/egl' >> >> gmake[4]: *** [default] Error 1 >> >> gmake[4]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware' >> >> gmake[3]: *** [default] Error 1 >> >> gmake[3]: Leaving directory `/opt/mesa/src/gallium/winsys/drm' >> >> gmake[2]: *** [default] Error 1 >> >> gmake[2]: Leaving directory `/opt/mesa/src/gallium/winsys' >> >> gmake[1]: *** [subdirs] Error 1 >> >> gmake[1]: Leaving directory `/opt/mesa/src' >> >> gmake: *** [default] Error 1 >> >> >> >> Regards, >> >> STEVE555 >> >> >> >> >> >> Keith Whitwell-3 wrote: >> >> > >> >> > This has reached a point where I could think about merging it. >> There >> >> is >> >> > plenty more cleanup to do, but the branch makes some big strides and >> >> > introduces a couple of concepts that I've wanted for a long time. >> >> > >> >> > In particular the idea of a designated "targets" subtree which has >> code >> >> > for explicitly constructing driver stacks. >> >> > >> >> > Secondly the ability to inject layers into (at least) the software >> >> > stacks has been greatly improved, and I'd like to see us build on >> that >> >> > for hardware drivers as well. >> >> > >> >> > There is probably still some bugfix to come, but if you're >> interested >> >> in >> >> > the software rasterizers, please check out this branch and let me >> know >> >> > how much I've broken things... >> >> > >> >> > Keith >> >> > >> >> > >> >> > >> >> >> ------------------------------------------------------------------------------ >> >> > 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 >> >> > Mes...@li... >> >> > 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 >> > Mes...@li... >> > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev >> > >> > >> > > > diff --git a/configure.ac b/configure.ac > index 70e158f..049c9e5 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -458,6 +458,7 @@ CORE_DIRS="glsl mesa" > SRC_DIRS="glew" > GLU_DIRS="sgi" > GALLIUM_DIRS="auxiliary drivers state_trackers" > +GALLIUM_TARGET_DIRS="" > GALLIUM_WINSYS_DIRS="" > GALLIUM_WINSYS_DRM_DIRS="" > GALLIUM_DRIVERS_DIRS="softpipe failover trace identity" > @@ -467,11 +468,12 @@ case "$mesa_driver" in > xlib) > DRIVER_DIRS="x11" > GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib" > + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib" > ;; > dri) > SRC_DIRS="$SRC_DIRS glx" > DRIVER_DIRS="dri" > - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm" > + GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib drm" > ;; > osmesa) > DRIVER_DIRS="osmesa" > @@ -481,6 +483,7 @@ AC_SUBST([SRC_DIRS]) > AC_SUBST([GLU_DIRS]) > AC_SUBST([DRIVER_DIRS]) > AC_SUBST([GALLIUM_DIRS]) > +AC_SUBST([GALLIUM_TARGET_DIRS]) > AC_SUBST([GALLIUM_WINSYS_DIRS]) > AC_SUBST([GALLIUM_WINSYS_DRM_DIRS]) > AC_SUBST([GALLIUM_DRIVERS_DIRS]) > @@ -1415,6 +1418,7 @@ echo "" > if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then > echo " Gallium: yes" > echo " Gallium dirs: $GALLIUM_DIRS" > + echo " Target dirs: $GALLIUM_TARGET_DIRS" > echo " Winsys dirs: $GALLIUM_WINSYS_DIRS" > echo " Winsys drm dirs:$GALLIUM_WINSYS_DRM_DIRS" > echo " Driver dirs: $GALLIUM_DRIVERS_DIRS" > > ------------------------------------------------------------------------------ > 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 > Mes...@li... > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > > -- View this message in context: http://old.nabble.com/sw-api-2-branch-tp27841684p27869260.html Sent from the mesa3d-dev mailing list archive at Nabble.com. |
From: Dan N. <dbn...@gm...> - 2010-03-11 20:23:48
|
On Thu, Mar 11, 2010 at 12:19 PM, STEVE555 <ste...@ho...> 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. -- Dan |
From: Dan N. <dbn...@gm...> - 2010-03-11 20:24:12
|
On Thu, Mar 11, 2010 at 12:23 PM, Dan Nicholson <dbn...@gm...> wrote: > On Thu, Mar 11, 2010 at 12:19 PM, STEVE555 <ste...@ho...> 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 |
From: STEVE555 <ste...@ho...> - 2010-03-11 21:58:14
|
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...@gm...> > wrote: >> On Thu, Mar 11, 2010 at 12:19 PM, STEVE555 <ste...@ho...> >> 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 > Mes...@li... > 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. |
From: Keith W. <kei...@go...> - 2010-03-11 22:14:01
|
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 <ste...@ho...> 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...@gm...> >> wrote: >>> On Thu, Mar 11, 2010 at 12:19 PM, STEVE555 <ste...@ho...> >>> 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 >> Mes...@li... >> 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 > Mes...@li... > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > |
From: STEVE555 <ste...@ho...> - 2010-03-11 22:20:32
|
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 <ste...@ho...> > 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...@gm...> >>> wrote: >>>> On Thu, Mar 11, 2010 at 12:19 PM, STEVE555 <ste...@ho...> >>>> 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 >>> Mes...@li... >>> 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 >> Mes...@li... >> 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 > Mes...@li... > 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. |
From: STEVE555 <ste...@ho...> - 2010-03-10 13:34:07
|
Hi Keith, I use 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 --ernable-debug I sometimes use --with-max-width= and --with-max-height= but the rest of them generally stay the same. Regards, STEVE555 Keith Whitwell-3 wrote: > > Steve, > > What configure options are those? > > Keith > > On Wed, 2010-03-10 at 04:41 -0800, STEVE555 wrote: >> Dear Keith, >> I checked out your branch using git checkout -b.and used >> git >> pull to get the differences between your branch and master.I did a gmake >> -B >> realclean and used my ./configure options I use for master. >> Unfortunately,it has stopped compiling with this error: >> >> /usr/bin/install -c vmwgfx_dri.so ../../../../../../lib/gallium >> gmake[5]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware/dri' >> gmake[5]: Entering directory >> `/opt/mesa/src/gallium/winsys/drm/vmware/egl' >> gcc -c -g -O2 -Wall -Wmissing-prototypes -std=c99 -ffast-math >> -fvisibility=hidden -fno-strict-aliasing -m32 -g -fPIC -m32 >> -DUSE_X86_ASM >> -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -D_GNU_SOURCE -DPTHREADS >> -DDEBUG >> -DHAVE_POSIX_MEMALIGN -DUSE_XCB -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER >> -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS >> -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 -D_GNU_SOURCE >> -DPTHREADS -DDEBUG -DHAVE_POSIX_MEMALIGN -DUSE_XCB >> -DUSE_EXTERNAL_DXTN_LIB=1 >> -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING >> -DHAVE_ALIAS >> -DHAVE_XEXTPROTO_71 -DMAX_WIDTH=4096 -DMAX_HEIGHT=4096 dummy.c -o dummy.o >> gmake[5]: *** No rule to make target >> `../../../../../../src/gallium/winsys/xlib/libws_xlib.a', needed by >> `egl_x11_vmwgfx.so'. Stop. >> gmake[5]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware/egl' >> gmake[4]: *** [default] Error 1 >> gmake[4]: Leaving directory `/opt/mesa/src/gallium/winsys/drm/vmware' >> gmake[3]: *** [default] Error 1 >> gmake[3]: Leaving directory `/opt/mesa/src/gallium/winsys/drm' >> gmake[2]: *** [default] Error 1 >> gmake[2]: Leaving directory `/opt/mesa/src/gallium/winsys' >> gmake[1]: *** [subdirs] Error 1 >> gmake[1]: Leaving directory `/opt/mesa/src' >> gmake: *** [default] Error 1 >> >> Regards, >> STEVE555 >> >> >> Keith Whitwell-3 wrote: >> > >> > This has reached a point where I could think about merging it. There >> is >> > plenty more cleanup to do, but the branch makes some big strides and >> > introduces a couple of concepts that I've wanted for a long time. >> > >> > In particular the idea of a designated "targets" subtree which has code >> > for explicitly constructing driver stacks. >> > >> > Secondly the ability to inject layers into (at least) the software >> > stacks has been greatly improved, and I'd like to see us build on that >> > for hardware drivers as well. >> > >> > There is probably still some bugfix to come, but if you're interested >> in >> > the software rasterizers, please check out this branch and let me know >> > how much I've broken things... >> > >> > Keith >> > >> > >> > >> ------------------------------------------------------------------------------ >> > 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 >> > Mes...@li... >> > 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 > Mes...@li... > https://lists.sourceforge.net/lists/listinfo/mesa3d-dev > > -- View this message in context: http://old.nabble.com/sw-api-2-branch-tp27841684p27849678.html Sent from the mesa3d-dev mailing list archive at Nabble.com. |