summaryrefslogtreecommitdiffstats
path: root/src/glx/x11/glxclient.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-111-1/+4
|\ | | | | | | | | | | | | | | | | | | | | gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
| * DRI2: Drop sarea, implement swap buffers in the X server.Kristian Høgsberg2008-08-291-1/+4
| |
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * glx: added __glXPreferEGL() to tell libGL to prefer "egl_" drivers over ↵Brian Paul2008-07-111-0/+2
| | | | | | | | | | | | regular DRI drivers. Also, clean-up, consolidate the dlopen() code a bit.
| * revert the DRI2 commitsAlan Hourihane2008-06-121-109/+62
| |
| * Bring in DRI2 changesAlan Hourihane2008-06-111-62/+109
| |
| * Remove CVS keywords.José Fonseca2008-05-261-1/+0
| |
* | glx: free vertex array state when context is destroyedKristof Ralovich2008-08-201-2/+3
| |
* | glx/x11: Fix missing __GL_EXT_BYTES declarationJeremy Huddleston2008-08-081-0/+2
| |
* | glx: load swrast_dri.soGeorge Sapountzis2008-06-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+4
| | | | | | | | also clean header inclusion after code movement
* | DRI interface changes and DRI2 direct rendering support.Kristian Høgsberg2008-03-311-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+5
| | | | | | | | | | | | 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-0/+2
| | | | | | | | This will be shared between dri and dri2 code.
* | Move DRI context functions into dri_glx.c.Kristian Høgsberg2008-03-081-18/+17
| | | | | | | | 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-11/+11
| |
* | Introduce __GLXDRIscreen so we can start moving function pointers in there.Kristian Høgsberg2008-03-081-9/+15
| | | | | | | | | | Temporarily rename the __DRIscreen member to __driScreen. Eventually, we'll move that into __GLXDRIscreen and only access it in dri_glx.c.
* | Move DRI specific parts of CreateContext into dri_glx.c.Kristian Høgsberg2008-03-081-0/+5
| |
* | Convert driCreateScreen and driDestroyScreen to function pointers.Kristian Høgsberg2008-03-081-3/+5
| | | | | | | | | | 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-10/+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.
* | Simplify dri loading code by eliminating dlopen "cache".Kristian Høgsberg2008-03-081-20/+2
| | | | | | | | | | | | | | 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-0/+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-3/+0
| |
* | Always call dlopen in DriverOpen.George Nassas2007-12-061-0/+1
| | | | | | | | | | | | This increases the reference count for the driver binary, preventing it from getting unloaded prematurely in driDestroyDisplay. See https://bugs.freedesktop.org/show_bug.cgi?id=13541 .
* | Fix compilation for !GLX_DIRECT_RENDERING.Kristian Høgsberg2007-11-061-6/+11
| |
* | Remove a couple of "deprecated" fields from __GLXcontextRec.Kristian Høgsberg2007-11-061-21/+0
| | | | | | | | | | The __GLXcontextRec struct is internal to the libGL implementation. No point in "deprecating", just get rid of it.
* | Handle fbconfigs and glx visuals separately.Kristian Høgsberg2007-10-161-2/+2
| | | | | | | | | | | | | | | | 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 media stream counter entry points to new extension.Kristian Høgsberg2007-10-111-0/+4
| |
* | Move GLX_MESA_swap_frame_usage DRI entry points to the new mechanism.Kristian Høgsberg2007-10-111-0/+4
| |
* | Move GLX_MESA_allocate_memory related functions to new extension mechanism.Kristian Høgsberg2007-10-111-0/+4
| |
* | Move swap_interval to new extension mechanism.Kristian Høgsberg2007-10-101-0/+4
| |
* | Move the copySubBuffer extension over to the new mechanism.Kristian Høgsberg2007-10-101-0/+5
| |
* | Drop createContext and destroyContext from DRIinterfaceMethods.Kristian Høgsberg2007-10-101-0/+5
| | | | | | | | | | | | | | | | | | | | 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 __DRInativeDisplay and pass in __DRIscreen pointers instead.Kristian Høgsberg2007-10-101-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+7
|/
* Clean up GLX function exports.Ian Romanick2006-08-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make functions for the following extensions only accessable via glXGetProcAddress: - GLX_EXT_texture_from_pixmap - GLX_MESA_copy_sub_buffer - GLX_MESA_release_buffers - GLX_MESA_swap_control - GLX_MESA_swap_frame_usage - GLX_OML_sync_control - GLX_SGI_make_current_read - GLX_SGI_swap_control - GLX_SGI_video_sync - GLX_SGIX_swap_barrier - GLX_SGIX_swap_group Removed all remnants of the following extensions: - GLX_MESA_set_3dfx_mode - GLX_SGI_cushion - GLX_SGIX_dmbuffer - GLX_SGIX_video_resize - GLX_SGIX_video_source - GLX_SUN_get_transparent_index -
* Convert all instances of XTHREADS to USE_XTHREADS. This fixes one ofIan Romanick2005-08-031-4/+4
| | | | | serveral things that are broken when building on a system with X.org 7.0rc0 installed.
* Fix build problems related to finding Xthreads.h.Ian Romanick2005-08-011-1/+1
|
* Remove unused structures and data fields. These had been left in becauseIan Romanick2005-07-291-49/+1
| | | | | | DRI drivers using the "old" interface relied on certain fields being at certain offsets. Removing the structures would break that. Now that the old interface is no longer supported, the dead data can finally die.
* Remove the last remnants of GLX_BUILT_IN_XMESA. This allows the removal ofIan Romanick2005-07-261-14/+0
| | | | the evil, ugly GLX_PREFIX macro as well.
* Fixes the glXGetProcAddress portion of the interface. Most of the functionsIan Romanick2005-07-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that are currently obtained via glXGetProcAddress and all of the XF86DRI functions are replaced with a funciton table. This table will be passed to __driCreateNewScreen. One of the functions in the table is getProcAddress. This allows some loaders to expose functionality not in all loaders. This will be immediatly used for glxEnableExtension (formerly known to drivers as __glXScrEnableExtension). libGL (and in the future libglx) expose this function so that drivers can enable GLX extensions. libEGL should exposed eglEnableExtension to enable EGL extensions. The same function cannot be used for both because the extensions have different names and (possibly) different semantics. Drivers can optionally use one, both, or neither. The key parts are in the __DRIinterfaceMethodsRec structure in dri_interface.h. A pointer to one of these structures is passed into __driCreateNewScreen. Because of this, the version of the API is bumped to 20050725. Since the previous version(s) were never in a release, their existance is erased. I was actually a little surprised by how much code this cuts from the drivers. A lot of glXGetProcAddress calls disappear, and a lot of version checks go with them. Nice. The one thing I'm not sure of is removing __glXInitialize. For some reason that function was in the glXGetProcAddress table, but *nothing* in the Mesa tree used it. Did something with DRI conf. use this function? It seems odd...
* Gut a few more dead bits. Replace uses of the CreateNewScreenFunc typedefIan Romanick2005-07-241-11/+2
| | | | | | | (from glxclient.h) with PFNCREATENEWSCREEN (from dri_interface.h). Remove the prototype for __driCreateScreen and fix the prototype for __driCreateNewScreen (append the API version) in dri_interface.h.
* All elements of pre-DRI_NEW_INTERFACE_ONLY are removed. This allowsIan Romanick2005-07-241-24/+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 pthreads and TLS to libGL for __glXLock / __glXUnlock andIan Romanick2005-04-181-6/+28
| | | | | | for tracking the current GLX context. This fixes bug #3024.
* Added __glExtensionBiIsEnabled and __GLXcontext::gl_extension_bits. ThisIan Romanick2005-02-221-96/+18
| | | | | | | | | | | | | | | enables libGL to query which extension are exported to applications. Refactored array-query functionality (from glGet*v) in src/glx/x11/single2.c. Massive re-write of indirect vertex array support. The most noticable effect is that glDrawElements now generates DrawArrays protocol. The side-effects (and the main reasons for the re-work) are that it is much easier to add support for new arrays (e.g., GL_VERTEX_ATTRIB_ARRAY, GL_WEIGHT_ARRAY_ARB, etc.) and it is much easier to add support for the new DrawArrays protocol (required to support ARB_vertex_buffer_object). These changes were primarilly tested with progs/demos/isosurf.
* Pixel oriented render functions are now generated by theIan Romanick2005-01-071-4/+8
| | | | | | glX_proto_send.py script. This eliminates ~600 lines of non-generated code. With proper compiler optimization settings, it also decreases the size of libGL.so by about 3KB.
* Make the transition to script-genereated GLX code easier.Ian Romanick2004-12-011-3/+0
| | | | | | Eliminate the need for indirect_wrap.h and NEED_GL_FUNCS_WRAPPED. Basically, this means prepending __indirect_ to all the definitions and calls of GL functions that don't already have it.
* Sync with Xorg head: mingw build fixes from Alexander Gottwald.Adam Jackson2004-11-151-0/+3
|
* Import the GLX client side library, formerly from xc/lib/GL/glx. Build itAdam Jackson2004-10-251-0/+833
by adding 'glx/x11' to SRC_DIRS in your build config.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 16:14:29 +0000