mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 02:10:11 +01:00
0397b2bb41
A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| clear-fbo-tex.c | ||
| clear-fbo.c | ||
| clear-scissor.c | ||
| clear-undefined.c | ||
| clear.c | ||
| createwin.c | ||
| dlist-dangling.c | ||
| dlist-edgeflag-dangling.c | ||
| dlist-edgeflag.c | ||
| drawarrays.c | ||
| drawelements.c | ||
| drawrange.c | ||
| flat-clip.c | ||
| fs-tri.c | ||
| line-clip.c | ||
| line-cull.c | ||
| line-smooth.c | ||
| line-stipple-wide.c | ||
| line-userclip-clip.c | ||
| line-userclip-nop-clip.c | ||
| line-userclip-nop.c | ||
| line-userclip.c | ||
| line-wide.c | ||
| line.c | ||
| lineloop-clip.c | ||
| lineloop-elts.c | ||
| lineloop.c | ||
| linestrip-clip.c | ||
| linestrip-flat-stipple.c | ||
| linestrip-stipple-wide.c | ||
| linestrip-stipple.c | ||
| linestrip.c | ||
| Makefile | ||
| pgon-mode.c | ||
| point-clip.c | ||
| point-param.c | ||
| point-sprite.c | ||
| point-wide-smooth.c | ||
| point-wide.c | ||
| point.c | ||
| poly-flat-clip.c | ||
| poly-flat-unfilled-clip.c | ||
| poly-flat.c | ||
| poly-unfilled.c | ||
| poly.c | ||
| psb_context.c | ||
| quad-clip-all-vertices.c | ||
| quad-clip-nearplane.c | ||
| quad-clip.c | ||
| quad-degenerate.c | ||
| quad-flat.c | ||
| quad-offset-factor.c | ||
| quad-offset-unfilled.c | ||
| quad-offset-units.c | ||
| quad-tex-2d.c | ||
| quad-tex-3d.c | ||
| quad-tex-alpha.c | ||
| quad-tex-pbo.c | ||
| quad-unfilled-clip.c | ||
| quad-unfilled-stipple.c | ||
| quad-unfilled.c | ||
| quad.c | ||
| quads.c | ||
| quadstrip-cont.c | ||
| quadstrip-flat.c | ||
| quadstrip.c | ||
| readpixels.c | ||
| tri-alpha-tex.c | ||
| tri-alpha.c | ||
| tri-blend-color.c | ||
| tri-blend-max.c | ||
| tri-blend-min.c | ||
| tri-blend-revsub.c | ||
| tri-blend-sub.c | ||
| tri-blend.c | ||
| tri-clear.c | ||
| tri-clip.c | ||
| tri-cull-both.c | ||
| tri-cull.c | ||
| tri-dlist.c | ||
| tri-edgeflag.c | ||
| tri-fbo-tex.c | ||
| tri-fbo.c | ||
| tri-flat-clip.c | ||
| tri-flat.c | ||
| tri-fog.c | ||
| tri-mask-tri.c | ||
| tri-orig.c | ||
| tri-query.c | ||
| tri-scissor-tri.c | ||
| tri-square.c | ||
| tri-stencil.c | ||
| tri-tex-3d.c | ||
| tri-tri.c | ||
| tri-unfilled-clip.c | ||
| tri-unfilled-edgeflag.c | ||
| tri-unfilled-point.c | ||
| tri-unfilled-smooth.c | ||
| tri-unfilled-userclip-stip.c | ||
| tri-unfilled-userclip.c | ||
| tri-unfilled.c | ||
| tri-userclip.c | ||
| tri-z-9.c | ||
| tri-z-eq.c | ||
| tri-z.c | ||
| tri.c | ||
| trifan-flat-clip.c | ||
| trifan-flat-unfilled-clip.c | ||
| trifan-flat.c | ||
| trifan-unfilled.c | ||
| trifan.c | ||
| tristrip-clip.c | ||
| tristrip-flat.c | ||
| tristrip.c | ||
| vbo-drawarrays.c | ||
| vbo-drawelements.c | ||
| vbo-drawrange.c | ||
| vp-array-int.c | ||
| vp-array.c | ||
| vp-clip.c | ||
| vp-line-clip.c | ||
| vp-tri.c | ||
| vp-unfilled.c | ||