summaryrefslogtreecommitdiffstats
path: root/src/glx/x11/glxext.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * revert the DRI2 commitsAlan Hourihane2008-06-121-155/+1043
| |
| * Bring in DRI2 changesAlan Hourihane2008-06-111-1043/+155
| |
| * mesa: disable visual warning unless LIBGL_DEBUG is definedBrian Paul2008-06-061-2/+4
| |
| * Remove CVS keywords.José Fonseca2008-05-261-1/+0
| |
* | glx: free driScreen in FreeScreenConfigs()Kristof Ralovich2008-08-201-0/+3
| |
* | fix mem leak (free psc->visuals)Kristof Ralovich2008-08-201-3/+6
| |
* | glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protectionJeremy Huddleston2008-08-081-1/+1
| |
* | glx: add LIBGL_ALWAYS_SOFTWAREGeorge Sapountzis2008-07-071-2/+9
| | | | | | | | | | | | this disables accelerated DRI and fallbacks to client-side software rendering. compile-tested only.
* | glx: load swrast_dri.soGeorge Sapountzis2008-06-131-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: split out current context codeGeorge Sapountzis2008-04-231-495/+16
| | | | | | | | also clean header inclusion after code movement
* | DRI interface changes and DRI2 direct rendering support.Kristian Høgsberg2008-03-311-24/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | glx: Add isDirect back to __GLXcontextRec. It is neededXiang, Haihao2008-03-181-2/+2
| | | | | | | | | | | | to check whether oldGC is used for direct rendering in function MakeContextCurrent. However it is possible oldGC->driContext is already freed. fix bug #14926.
* | libGL: Pull the drawable hash back out in the generic code.Kristian Høgsberg2008-03-121-2/+17
| | | | | | | | This will be shared between dri and dri2 code.
* | Add another missing check for uninitialized DRI.Kristian Høgsberg2008-03-121-1/+2
| | | | | | | | Spotted by Chris Taylor.
* | Only try to call DRI function if DRI got initialized properly.Kristian Høgsberg2008-03-101-1/+2
| |
* | remove extra #include of assert.h (bug 14932)Brian2008-03-101-1/+0
| |
* | Use _X_HIDDEN to hide a bunch of leaked symbols.Kristian Høgsberg2008-03-081-22/+22
| |
* | Move DRI context functions into dri_glx.c.Kristian Høgsberg2008-03-081-45/+20
| | | | | | | | Also drop isDirect flag; if gc->driContext is non-NULL, it's direct.
* | Move DRI drawable creation into dri_glx.c.Kristian Høgsberg2008-03-081-39/+6
| |
* | Introduce __GLXDRIscreen so we can start moving function pointers in there.Kristian Høgsberg2008-03-081-8/+8
| | | | | | | | | | Temporarily rename the __DRIscreen member to __driScreen. Eventually, we'll move that into __GLXDRIscreen and only access it in dri_glx.c.
* | Convert driCreateScreen and driDestroyScreen to function pointers.Kristian Høgsberg2008-03-081-2/+2
| | | | | | | | | | We avoid leaking the symbols and will be able to replace them with DRI2 implementation later on.
* | Abstract __DRIdisplayPrivateRec away in dri_glx.c.Kristian Høgsberg2008-03-081-8/+5
| | | | | | | | | | | | | | | | This patch moves __DRIdisplayPrivateRec definition into dri_glx.c and let's dri_glx.c allocate the __DRIdisplay struct pointer to from __GLXdisplayPrivate. A small step towards moving more of the dri functionality into dri_glx.c.
* | Make __glXCloseDisplay static instead of prototyping it to avoid warning.Kristian Høgsberg2008-03-081-9/+1
| |
* | Simplify dri loading code by eliminating dlopen "cache".Kristian Høgsberg2008-03-081-10/+1
| | | | | | | | | | | | | | No need to jump through hoops to track __DRIdrivers and avoid dlopening the same .so more than twice, dlopen() does this internally. Besides, we were already bypassing this and dlopening drivers for each screen, whether or not they were already dlopened.
* | libGL: Consolidate DRI initialization in dri_glx.cKristian Høgsberg2008-03-081-406/+2
| | | | | | | | Move a lot of code over from glx_ext.c.
* | Update libGL DRI loader to latest DRI interface changes.Kristian Høgsberg2008-02-291-7/+22
| |
* | Fix compilation for !GLX_DIRECT_RENDERING.Kristian Høgsberg2007-11-061-1/+1
| |
* | Don't return 0 in a void function.Kristian Høgsberg2007-11-061-2/+2
| |
* | Filter both visuals and fbconfigs against driver supported configs.Kristian Høgsberg2007-11-051-6/+3
| |
* | Fix some build warnings, mostly with XCB.Michel Dänzer2007-10-301-1/+2
| |
* | Pull workaround for unset GLX_DRAWABLE_TYPE back in.Kristian Høgsberg2007-10-171-0/+2
| | | | | | | | | | | | | | | | | | The old version just set GLX_DRAWABLE_TYPE to GLX_WINDOW_BIT for configs received through glXGetVisualConfigs and to GLX_WINDOW_BIT | GLX_PIXMAP_BIT for configs received as FBConfigs. The X server needs to send this info, but keep the workaround for now. Fixes #12835.
* | Handle fbconfigs and glx visuals separately.Kristian Høgsberg2007-10-161-140/+127
| | | | | | | | | | | | | | | | The old implementation fetches fbconfigs or glx visuals once and assumes the list describes both fbconfigs and glx visuals. This patch splits it up and fetches visuals and fbconfigs in two steps and keep the two lists separate. A server could have no glx visuals or no glx fbconfigs and the old code wouldn't know the difference.
* | Move enabling of DRI extensions into glxextensions.cKristian Høgsberg2007-10-111-68/+1
| |
* | Remove now unused getProcAddress from DRIinterfaceMethods.Kristian Høgsberg2007-10-111-15/+0
| |
* | Add a DRI_ReadDrawable marker extension to signal read drawable capability.Kristian Høgsberg2007-10-111-0/+7
| |
* | Move media stream counter entry points to new extension.Kristian Høgsberg2007-10-111-1/+14
| |
* | Move GLX_MESA_swap_frame_usage DRI entry points to the new mechanism.Kristian Høgsberg2007-10-111-3/+8
| |
* | Move GLX_MESA_allocate_memory related functions to new extension mechanism.Kristian Høgsberg2007-10-111-0/+11
| |
* | Move swap_interval to new extension mechanism.Kristian Høgsberg2007-10-101-0/+12
| |
* | Move the copySubBuffer extension over to the new mechanism.Kristian Høgsberg2007-10-101-1/+9
| |
* | Implement new screen extension API.Kristian Høgsberg2007-10-101-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | This new API lets the loader examine DRI level extensions provided by the driver in a forward compatible manner. Much of the churn in the DRI interface is adding support for new extensions or removing old, unused extensions. This new extension mechanism lets the loader query the extensions provided by the driver and implement the extensions it knows about. Deprecating extensions is done by not exporting that extension in the list, which doesn't require keeping old function pointers around to preserve ABI.
* | Stop passing in unused fbconfigs to createNewScreen.Kristian Høgsberg2007-10-101-3/+1
| |
* | Convert all DRI entrypoints to take pointers to __DRI* types.Kristian Høgsberg2007-10-101-4/+4
| | | | | | | | | | | | | | | | | | | | The entrypoints take a mix of __DRIscreen * and void * (screen private) arguments (similarly for contexts and drawables). This patch does away with passing the private void pointer and always only passes the fully typed __DRIscreen pointer and always as the first argument. This makes the interface more consistent and increases type safety, and catches a bug where we would pass a screen private to DRIdrawable::getSBC.
* | Remove screenConfigs from __DRIscreen.Kristian Høgsberg2007-10-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The screenConfigs field of __DRIscreen points back to the containing __GLXscreenConfigs struct. This is a serious abstraction violation; it assumes that the loader is libGL and that there *is* a __GLXscreenConfigs type in the loader. Using the containerOf macro, we can get from the __DRIscreen pointer to the containing __GLXscreenConfigs struct, at a place in the stack where the above is a valid assumption. Besides, the __DRI* structs shouldn't hold state other than the private pointer.
* | Drop createContext and destroyContext from DRIinterfaceMethods.Kristian Høgsberg2007-10-101-25/+3
| | | | | | | | | | | | | | | | | | | | As for createDrawable and destroyDrawable, these functions immediately upon entry to driCreateNewContext and immediately before exit from driDestroyContext. Instead of passing function pointers back and forth just obtain the drm_context_t prior to calling DRIscreen::createNewContext and pass it as a parameter. This change also lets us keep the DRI context XID in the libGL loader only.
* | Drop createDrawable and destroyDrawable fron DRIinterfaceMethods.Kristian Høgsberg2007-10-101-29/+13
| | | | | | | | | | | | | | | | | | | | | | | | All the DRI driver did was call the createDrawable callback immediately upon entry to DRIscreen::createNewDrawable to get the drm_drawable_t. We can just call that before calling into the DRI driver and pass the returned drm_drawable_t as an argument to the DRI entry point. Likewise for destroyDrawable. Also, DRIdrawablePrivate::draw isn't used anywhere, and since the driver no longer needs the XID of the drawable we can now drop that.
* | Drop __DRInativeDisplay and pass in __DRIscreen pointers instead.Kristian Høgsberg2007-10-101-59/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | Many DRI entry points took a __DRInativeDisplay pointer and a screen index as arguments. The only use for the native display pointer was to pass it back to the loader when looking up the __DRIscreen for the given screen index. Instead, let's just pass in the __DRIscreen pointer directly, which let's drop the __DRInativeDisplay type and the getScreen function. The assumption is now that the loader will be able to retrieve context from the __DRIscreen pointer when necessary.
* | Remove XIDs from DRI interface (see #5714).Kristian Høgsberg2007-10-051-12/+64
| |
* | suppress warning about ncon visuals (bug #6689)Roland Scheidegger2007-08-161-2/+5
|/
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 08:45:58 +0000