<feed xmlns='http://www.w3.org/2005/Atom'>
<title>android-x86-mesa.git/src/glx/x11/Makefile, branch r300</title>
<subtitle>Androïd/x86 port of Mesa drivers
</subtitle>
<id>https://git.hiegel.fr/cgit/android-x86-mesa.git/atom?h=r300</id>
<link rel='self' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/atom?h=r300'/>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/'/>
<updated>2010-02-09T14:58:36Z</updated>
<entry>
<title>Retire miniglx and move the actual glx code up to src/glx</title>
<updated>2010-02-09T14:58:36Z</updated>
<author>
<name>Kristian Høgsberg</name>
<email>krh@bitplanet.net</email>
</author>
<published>2010-02-09T14:58:36Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=6e8897ff9f90601ebf6eed500ad942c11b54d1f7'/>
<id>urn:sha1:6e8897ff9f90601ebf6eed500ad942c11b54d1f7</id>
<content type='text'>
</content>
</entry>
<entry>
<title>glx: Build GLX normally.</title>
<updated>2010-01-26T03:03:54Z</updated>
<author>
<name>Chia-I Wu</name>
<email>olvaffe@gmail.com</email>
</author>
<published>2010-01-21T09:58:28Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=146931769c75978c58ac0088e8ab630fc41074ec'/>
<id>urn:sha1:146931769c75978c58ac0088e8ab630fc41074ec</id>
<content type='text'>
GLX was built specially and before Mesa core because libglapi.a could
not be built with IN_DRI_DRIVER defined.  This is no longer the case
since 6e99e6ddbf488f6955e34ef0bc438fdcb4d90f74.

It works fine in my (limited) testing with both direct and indirect
rendering.  I also compare the outputs after preprocessing (gcc -E) with
or without this commit, and they are identical.
</content>
</entry>
<entry>
<title>mesa: Remove left over merge conflicts</title>
<updated>2008-09-22T10:47:57Z</updated>
<author>
<name>Jakob Bornecrantz</name>
<email>jakob@tungstengraphics.com</email>
</author>
<published>2008-09-22T10:47:57Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=c9122c0c0308345e2df2448bcb189d0f5d505909'/>
<id>urn:sha1:c9122c0c0308345e2df2448bcb189d0f5d505909</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'master' into gallium-0.2</title>
<updated>2008-09-21T17:28:06Z</updated>
<author>
<name>Keith Whitwell</name>
<email>keith@tungstengraphics.com</email>
</author>
<published>2008-09-21T17:28:06Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=9644fa6c48f596875f6955728c3a8af1b01a5028'/>
<id>urn:sha1:9644fa6c48f596875f6955728c3a8af1b01a5028</id>
<content type='text'>
Conflicts:

	include/GLES/egl.h
	include/GLES/egltypes.h
	src/egl/main/eglconfig.c
	src/egl/main/eglconfig.h
	src/glu/sgi/libnurbs/interface/bezierEval.h
	src/glu/sgi/libnurbs/interface/bezierPatch.h
	src/glu/sgi/libnurbs/interface/bezierPatchMesh.h
	src/glu/sgi/libnurbs/internals/dataTransform.h
	src/glu/sgi/libnurbs/internals/displaymode.h
	src/glu/sgi/libnurbs/internals/sorter.h
	src/glu/sgi/libnurbs/nurbtess/definitions.h
	src/glu/sgi/libnurbs/nurbtess/directedLine.h
	src/glu/sgi/libnurbs/nurbtess/gridWrap.h
	src/glu/sgi/libnurbs/nurbtess/monoChain.h
	src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h
	src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h
	src/glu/sgi/libnurbs/nurbtess/partitionX.h
	src/glu/sgi/libnurbs/nurbtess/partitionY.h
	src/glu/sgi/libnurbs/nurbtess/polyDBG.h
	src/glu/sgi/libnurbs/nurbtess/polyUtil.h
	src/glu/sgi/libnurbs/nurbtess/primitiveStream.h
	src/glu/sgi/libnurbs/nurbtess/quicksort.h
	src/glu/sgi/libnurbs/nurbtess/rectBlock.h
	src/glu/sgi/libnurbs/nurbtess/sampleComp.h
	src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h
	src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h
	src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h
	src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h
	src/glu/sgi/libnurbs/nurbtess/sampledLine.h
	src/glu/sgi/libnurbs/nurbtess/searchTree.h
	src/glu/sgi/libnurbs/nurbtess/zlassert.h
	src/glu/sgi/libutil/error.c
	src/glu/sgi/libutil/glue.c
	src/glu/sgi/libutil/gluint.h
	src/glu/sgi/libutil/project.c
	src/glu/sgi/libutil/registry.c
	src/glx/x11/Makefile
	src/glx/x11/glxclient.h
	src/glx/x11/glxext.c
	src/mesa/drivers/dri/ffb/ffb_dd.h
	src/mesa/drivers/dri/ffb/ffb_points.h
	src/mesa/drivers/dri/gamma/gamma_context.h
	src/mesa/drivers/dri/gamma/gamma_macros.h
	src/mesa/drivers/dri/i810/i810context.h
	src/mesa/drivers/dri/r128/r128_dd.h
	src/mesa/drivers/dri/r128/r128_tex.h
	src/mesa/drivers/dri/tdfx/tdfx_dd.h
	src/mesa/drivers/x11/xm_buffer.c
	src/mesa/glapi/glapi.c
	src/mesa/main/dispatch.c
	src/mesa/main/state.c
	src/mesa/main/texstate.c
	src/mesa/shader/arbprogparse.c
	src/mesa/shader/arbprogram.c
	src/mesa/shader/nvfragparse.c
	src/mesa/shader/nvprogram.c
	src/mesa/shader/shader_api.c
	src/mesa/sources
	src/mesa/swrast/s_aaline.c
	src/mesa/swrast/s_aaline.h
	src/mesa/swrast/s_aatriangle.h
	src/mesa/swrast/s_accum.c
	src/mesa/swrast/s_alpha.h
	src/mesa/swrast/s_bitmap.c
	src/mesa/swrast/s_blend.h
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_copypix.c
	src/mesa/swrast/s_depth.c
	src/mesa/swrast/s_depth.h
	src/mesa/swrast/s_drawpix.c
	src/mesa/swrast/s_drawpix.h
	src/mesa/swrast/s_feedback.c
	src/mesa/swrast/s_feedback.h
	src/mesa/swrast/s_fog.h
	src/mesa/swrast/s_lines.h
	src/mesa/swrast/s_logic.h
	src/mesa/swrast/s_masking.h
	src/mesa/swrast/s_points.c
	src/mesa/swrast/s_points.h
	src/mesa/swrast/s_readpix.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_span.h
	src/mesa/swrast/s_stencil.h
	src/mesa/swrast/s_texcombine.c
	src/mesa/swrast/s_texcombine.h
	src/mesa/swrast/s_texfilter.c
	src/mesa/swrast/s_texfilter.h
	src/mesa/swrast/s_texstore.c
	src/mesa/swrast/s_triangle.c
	src/mesa/swrast/s_triangle.h
	src/mesa/swrast/s_zoom.h
	src/mesa/swrast_setup/ss_context.c
	src/mesa/swrast_setup/ss_triangle.h
	src/mesa/tnl/t_draw.c
	src/mesa/tnl/t_vb_light.c
	src/mesa/tnl/t_vertex_generic.c
	src/mesa/tnl/t_vertex_sse.c
	src/mesa/tnl/t_vp_build.h
	src/mesa/tnl/tnl.h
	src/mesa/x86/common_x86.c
</content>
</entry>
<entry>
<title>glx: re-add glapi/ path</title>
<updated>2008-09-19T03:22:08Z</updated>
<author>
<name>Brian</name>
<email>brian.paul@tungstengraphics.com</email>
</author>
<published>2008-09-19T03:22:08Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=19d9c81b8c785e94b95110a45497aa52f4a53a34'/>
<id>urn:sha1:19d9c81b8c785e94b95110a45497aa52f4a53a34</id>
<content type='text'>
</content>
</entry>
<entry>
<title>mesa: fix asst path/include mistakes in prev commits</title>
<updated>2008-09-18T22:48:11Z</updated>
<author>
<name>Chris Rankin</name>
<email>rankincj@yahoo.com</email>
</author>
<published>2008-09-18T22:48:11Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=8d41e4536dfde34b55228cab6ddb081ad6252184'/>
<id>urn:sha1:8d41e4536dfde34b55228cab6ddb081ad6252184</id>
<content type='text'>
</content>
</entry>
<entry>
<title>glx: remove #include "glheader.h" lines</title>
<updated>2008-09-18T19:26:30Z</updated>
<author>
<name>Brian Paul</name>
<email>brian.paul@tungstengraphics.com</email>
</author>
<published>2008-09-18T19:26:30Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=a25e1aa0aab6bd278eefa7c0748b491c9c6ae62c'/>
<id>urn:sha1:a25e1aa0aab6bd278eefa7c0748b491c9c6ae62c</id>
<content type='text'>
Was only used to get the PUBLIC/USED macros.
Also, replace "GL_FALSE" with "False" in a couple places.
</content>
</entry>
<entry>
<title>Merge branch 'gallium-0.1' into gallium-0.2</title>
<updated>2008-09-11T15:05:15Z</updated>
<author>
<name>Keith Whitwell</name>
<email>keith@tungstengraphics.com</email>
</author>
<published>2008-09-11T15:05:15Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=0397b2bb41b0f337af2949a15bcd7d0e7e8a7dc1'/>
<id>urn:sha1:0397b2bb41b0f337af2949a15bcd7d0e7e8a7dc1</id>
<content type='text'>
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
</content>
</entry>
<entry>
<title>fix compilation</title>
<updated>2008-08-13T11:14:47Z</updated>
<author>
<name>Zack Rusin</name>
<email>zack@tungstengraphics.com</email>
</author>
<published>2008-08-13T11:14:47Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=d8be393cb60d908f98f0edb74c1c7964e8f690fe'/>
<id>urn:sha1:d8be393cb60d908f98f0edb74c1c7964e8f690fe</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Fixed 'make install' for darwin</title>
<updated>2008-08-12T17:59:40Z</updated>
<author>
<name>Jeremy Huddleston</name>
<email>jeremyhu@freedesktop.org</email>
</author>
<published>2008-08-12T17:59:40Z</published>
<link rel='alternate' type='text/html' href='https://git.hiegel.fr/cgit/android-x86-mesa.git/commit/?id=98e7c1cf3852fbc2924b55b5a684f13a710eec04'/>
<id>urn:sha1:98e7c1cf3852fbc2924b55b5a684f13a710eec04</id>
<content type='text'>
</content>
</entry>
</feed>
