summaryrefslogtreecommitdiffstats
path: root/src/glx/x11/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Retire miniglx and move the actual glx code up to src/glxKristian Høgsberg2010-02-091-97/+0
|
* glx: Build GLX normally.Chia-I Wu2010-01-261-12/+9
| | | | | | | | | | 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.
* mesa: Remove left over merge conflictsJakob Bornecrantz2008-09-221-4/+0
|
* Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-211-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * glx: re-add glapi/ pathBrian2008-09-181-0/+1
| |
| * mesa: fix asst path/include mistakes in prev commitsChris Rankin2008-09-181-1/+1
| |
| * glx: remove #include "glheader.h" linesBrian Paul2008-09-181-1/+0
| | | | | | | | | | Was only used to get the PUBLIC/USED macros. Also, replace "GL_FALSE" with "False" in a couple places.
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-4/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * fix compilationZack Rusin2008-08-131-1/+1
| |
| * revert the DRI2 commitsAlan Hourihane2008-06-121-16/+11
| |
| * Hook gallium i915 up to DRI2Alan Hourihane2008-06-111-0/+1
| |
| * Bring in DRI2 changesAlan Hourihane2008-06-111-11/+15
| |
| * Simplify makefile boilerplate code.José Fonseca2008-02-191-3/+3
| | | | | | | | | | Don't define ASM_SOURCES variable globally -- reserve that variable to be defined locally by makefiles, together with C_SOURCES and CPP_SOURCES.
| * Add src/mesa to include path.José Fonseca2007-12-121-0/+1
| |
| * Gutsy oopses on touch of existing file. Workaround.Keith Whitwell2007-08-071-0/+1
| |
* | Fixed 'make install' for darwinJeremy Huddleston2008-08-121-1/+1
| |
* | Apple: Cleaned up some linking and dylib ids issuesJeremy Huddleston2008-08-111-1/+2
| |
* | Call mklib with $(SHELL) so the user controls the interpreterDan Nicholson2008-07-121-1/+1
| | | | | | | | | | Respect the user's choice of shell when running mklib rather than always using /bin/sh.
* | glx: load swrast_dri.soGeorge Sapountzis2008-06-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | caveats: - does not work with old (i.e. libGLcore) xserver: - made unbindContext a noop - extensions: GLX_SGI_make_current_read GLX_EXT_texture_from_pixmap GLX_MESA_copy_sub_buffer
* | glx: add dri_common.c ala xserverGeorge Sapountzis2008-06-091-0/+1
| | | | | | | | | | | | also drop driFilterModes which is unused in preparation of loading swrast_dri.so
* | replace make with $(MAKE) (bug 16133)Brian Paul2008-05-281-1/+1
| |
* | Always cleanup the makedepend backup filesDan Nicholson2008-05-061-1/+1
| | | | | | | | | | | | Consistently cleanup the depend.bak files created by makedepend. Also, realclean has been changed to use a single find command, which speeds it up considerably.
* | glx: nitpick renamesGeorge Sapountzis2008-04-231-1/+1
| |
* | glx: split out current context codeGeorge Sapountzis2008-04-231-0/+1
| | | | | | | | also clean header inclusion after code movement
* | DRI interface changes and DRI2 direct rendering support.Kristian Høgsberg2008-03-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DRI2 direct rendering support to libGL and add DRI2 client side protocol code. Extend the GLX 1.3 create drawable functions in glx_pbuffer.c to call into the DRI driver when possible. Introduce __DRIconfig, opaque struct that represents a DRI driver configuration. Get's rid of the open coded __GLcontextModes in the DRI driver interface and the context modes create and destroy functions that the loader was requires to provide. glcore.h is no longer part of the DRI driver interface. The DRI config is GL binding agnostic, that is, not specific to GLX, EGL or other bindings. The core API is now also an extension, and the driver exports a list of extensions as the symbol __driDriverExtensions, which the loader must dlsym() for. The list of extension will always include the DRI core extension, which allows creating and manipulating DRI screens, drawables and contexts. The DRI legacy extension, when available, provides alternative entry points for creating the DRI objects that work with the XF86DRI infrastructure. Change DRI2 client code to not use drm drawables or contexts. We never used drm_drawable_t's and the only use for drm_context_t was as a unique identifier when taking the lock. We now just allocate a unique lock ID out of the DRILock sarea block. Once we get rid of the lock entirely, we can drop this hack. Change the interface between dri_util.c and the drivers, so that the drivers now export the DriverAPI struct as driDriverAPI instead of the InitScreen entry point. This lets us avoid dlsym()'ing for the DRI2 init screen function to see if DRI2 is supported by the driver.
* | Move make install logic for libGL back into src/mesa/Makefile.Kristian Høgsberg2008-03-101-15/+2
| | | | | | | | | | | | | | | | | | This makes make install work again for non-glx libGL implementations. The make install logic is split into three sub-targets: install-libgl, install-osmesa, install-drivers. The install target in src/glx/x11 is then implemented using the src/mesa make install-libgl rule. Thanks to Dan Nicholson for pointing out the breakage.
* | Move libGL install target to the libGL Makefile.Kristian Høgsberg2008-03-081-2/+15
| |
* | autoconf: Add gcc search patch to MKDEP_OPTIONS to eliminate warnings.Kristian Høgsberg2008-02-251-1/+1
| | | | | | | | | | Also, use -include to avoid error message when make initially fails to include the non-existent depend file.
* | Pull in the drm hash.Kristian Høgsberg2007-10-051-1/+2
| |
* | add support for LDFLAGS env varDan Nicholson2007-09-281-1/+1
|/
* fix etags command to find headersBrian2007-04-071-1/+1
|
* Move glcontextmodes.c to glx.George Sapountzis2007-04-051-4/+0
| | | | | It is no longer linked with DRI drivers, libGL passes function pointers through the DRI interface.
* linux-indirect target fixes.Adam Jackson2006-08-101-1/+1
|
* LIB_DIR is now just 'lib' or 'lib64'Brian Paul2006-07-131-5/+5
| | | | | Replaced $(LIB_DIR) with $(TOP)/$(LIB_DIR), use LIB_DIR in install targets. Patch by Hanno Böck.
* New 'install' targets in makefile. See bug 2372.Brian Paul2006-06-221-1/+4
|
* Instead of adding extra flags to DEFINES with +=, define EXTRA_DEFINES instead.Brian Paul2006-03-091-3/+3
| | | | This eliminates a bunch of duplication in the compilation commmands.
* use ASM_API variable, bug 4415Brian Paul2005-09-121-12/+10
|
* Convert libGL and DRI drivers to require libdrm.Adam Jackson2005-08-191-6/+1
| | | | | | libdrm can be had from: http://people.freedesktop.org/~ajax/libdrm/
* Makefile cleanups suggested by George Fufutos (bugzilla #3899).Ian Romanick2005-08-111-17/+1
|
* Add a new config called linux-indirect. This build the GLX libGL just likeIan Romanick2005-07-291-2/+1
| | | | | | linux-dri, but it disables support for direct-rendering in it. This config mainly exists so that I can verify that changes to libGL haven't broken builds on non-DRI platforms.
* Quote $(CC) and $(CXX) so that 'CC=ccache gcc' and 'CXX=ccache g++' willIan Romanick2005-07-261-1/+1
| | | | work again.
* Added -linker option to mklib, used to specify a particular program forBrian Paul2005-07-251-1/+2
| | | | | linking, if relevant. Updated Makefiles to use -linker option instead of setting CC, CXX env vars.
* All elements of pre-DRI_NEW_INTERFACE_ONLY are removed. This allowsIan Romanick2005-07-241-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1,402 lines of code to be removed from Mesa (drivers and libGL). The big winner is dri_util.c. Primary changes are: 1. Remove all "deprecated" entry-points from the various structures in dri_interface.h. 2. Rename the remaining fields to removed "version numbers." So, bindContext3 becomes bindContext. Functions with "New" in the name (e.g., CreateNewContext) were *not* changed, but that is an option. Having "New" in the name is less annoying to me than having "3" in the name. 3. Remove all compatibility code that handles cases where the driver or the loader is too old to support the latest interfaces. 4. Append the API version to the __driCreateNewScreen function name. This is currently done by hand. In the future (i.e., the next time we make an incompatible change to the interface) we'll want to come up with a better way to do this. This prevents old loaders from being able to load new (incompatible) drivers. 5. Bump the API version to 20050722. All drivers (by way of dri_util.c) require this version. 6. All drivers are *required* to expose GLX_SGIX_fbconfig and GLX_OML_swap_method (or the moral equivalents). Support for these functions in implicit in the use of the "new" interface. 7. Some cases still exist that need to be compiled differently in a loader or core Mesa versus in a driver. These are identified by the define IN_DRI_DRIVER.
* Add support for assembly (static) dispatch functions on x86-64. ThisIan Romanick2005-07-021-0/+1
| | | | | | is basically patch #2939 from X.org bugzilla #3379. This does *not* fix the bug as it does not dynamically generate stubs at run-time. It just gets things one step closer.
* use shared-coreDave Airlie2005-05-281-1/+1
|
* Use the same dispatch.c source file for "normal" Mesa builds and DRIIan Romanick2005-04-071-0/+3
| | | | libGL builds.
* Add GLX protocol support for ARB_fragement_program,Ian Romanick2005-02-251-0/+1
| | | | | | | ARB_fragment_program_shadow, ARB_vertex_program, NV_fragment_program, NV_fragment_program_option, NV_fragment_program2, NV_vertex_program, NV_vertex_program1_1, NV_vertex_program2, NV_vertex_program2_option, NV_vertex_program3, and ATI_text_fragment_shader.
* Missed the Makefile with the previous commit.Ian Romanick2005-02-231-0/+1
|
* Depend tweaksKeith Whitwell2005-01-191-3/+2
|
* Put quotes around the CC and CXX variables passed to mklib. This makeIan Romanick2005-01-111-1/+1
| | | | them work with multi-work compiler names (e.g., "ccache gcc").
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-19 19:35:21 +0000