android-x86-mesa.git/src/glut/beos, branch r300 Androïd/x86 port of Mesa drivers https://git.hiegel.fr/cgit/android-x86-mesa.git/atom?h=r300 2008-09-11T15:05:15Z Merge branch 'gallium-0.1' into gallium-0.2 2008-09-11T15:05:15Z Keith Whitwell keith@tungstengraphics.com 2008-09-11T15:05:15Z urn:sha1:0397b2bb41b0f337af2949a15bcd7d0e7e8a7dc1 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 Always pass -linker and -ldflags to mklib for shared libraries 2008-07-12T17:25:40Z Dan Nicholson dbn.lists@gmail.com 2008-07-12T17:04:44Z urn:sha1:3b8081603bf846285e56a6ecafaf182935fd8733 This just makes the use of mklib more consistent throughout Mesa where we always want to pass the linker and LDFLAGS when we might be making a shared library. Call mklib with $(SHELL) so the user controls the interpreter 2008-07-12T17:25:40Z Dan Nicholson dbn.lists@gmail.com 2008-07-11T20:54:48Z urn:sha1:db072baaaf6adcd176ea7e4d67b77177de7eca31 Respect the user's choice of shell when running mklib rather than always using /bin/sh. Remove CVS keywords. 2008-05-26T11:14:40Z José Fonseca jrfonseca@tungstengraphics.com 2008-05-26T11:14:40Z urn:sha1:77ce568ff704e6cdcfaa557965c894752d19e462 add support for LDFLAGS env var 2007-09-29T00:42:21Z Dan Nicholson dbn.lists@gmail.com 2007-09-29T00:42:21Z urn:sha1:2a3e33865dd9a3d064a3c0af94ef11d4aa4a6ce4 Gutsy oopses on touch of existing file. Workaround. 2007-08-07T09:18:30Z Keith Whitwell keith@tungstengraphics.com 2007-08-07T09:18:04Z urn:sha1:90ee7a41443a971d6ff2e0a6e90997806c28d11b LIB_DIR is now just 'lib' or 'lib64' 2006-07-13T02:50:27Z Brian Paul brian.paul@tungstengraphics.com 2006-07-13T02:50:27Z urn:sha1:883f9891cb203dd087843b830ab058d6c9e160dc Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck. Fixed warnings by using GLUTProc type instead of anonymous (void *) for 2005-07-18T19:27:49Z Philippe Houdoin phoudoin@freedesktop.org 2005-07-18T19:27:49Z urn:sha1:ed886336e12d54e897285ce609447b39cc62a08d GLUT callbacks. Improve the behaviour of the build system wrt depend files. 2004-12-08T15:16:36Z Keith Whitwell keith@tungstengraphics.com 2004-12-08T15:16:36Z urn:sha1:fc236723273d4d872ae5e7cac876ea20175df10d - Remove the -Y option for makedepend, so that the standard directories are searched - No longer pipe the multiple errors that the -Y option caused into /dev/null -- we want to know about these failures. - Fix up a few other misc makedepend failures. Add glutGetProcAddress(). Not all GLUT version 5 APIs are supported yet, thought. 2004-08-16T08:46:38Z Philippe Houdoin phoudoin@freedesktop.org 2004-08-16T08:46:38Z urn:sha1:479b3d074589b1582e85aec90e53b82154ebcc2d -> #define GLUT_API_VERSION 4.5 ? ;-)