summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2008-09-19Update to SGI FreeB 2.0.Adam Jackson3-92/+84
Under the terms of version 1.1, "once Covered Code has been published under a particular version of the License, Recipient may, for the duration of the License, continue to use it under the terms of that version, or choose to use such Covered Code under the terms of any subsequent version published by SGI." FreeB 2.0 license refers to "dates of first publication". They are here taken to be 1991-2000, as noted in the original license text: ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. Official FreeB 2.0 text: http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf As always, this code has not been tested for conformance with the OpenGL specification. OpenGL conformance testing is available from http://khronos.org/ and is required for use of the OpenGL logo in product advertising and promotion.
2008-08-29DRI2: Drop sarea, implement swap buffers in the X server.Kristian Høgsberg2-157/+60
2008-08-11version 41 of glext.hBrian Paul1-2/+380
2008-08-11version 20 of glxext.hBrian Paul1-2/+34
2008-08-08Apple: Some changes to fix compilation problems on OSXJeremy Huddleston1-0/+7
2008-07-15additional preprocessor checks for stdint.h, inttypes.h, etcBlair Sadewitz2-7/+7
The patches to glext.h and glxext.h have been sent to Khronos/bugzilla.
2008-06-04remove old/unused foomesa.h example headerBrian Paul1-76/+0
2008-05-29Assorted Windows fixes (Karl Schultz)Brian Paul1-1/+1
2008-05-23drop GLcoreGeorge Sapountzis1-73/+0
2008-05-20Add DRI driver that uses the mesa swrast module.George Sapountzis1-0/+57
2008-04-23glcore: build from mesaGeorge Sapountzis1-0/+73
2008-03-31DRI interface changes and DRI2 direct rendering support.Kristian Høgsberg2-205/+215
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.
2008-03-25updated to version 40Brian1-3/+14
2008-03-24fix wrong values for GL_READ/DRAW_FRAMEBUFFER_BINDING_EXT tokensBrian1-2/+2
2008-03-09DRI2: Make setTexBuffer take a __DRIdrawable instead of a BO handle.Kristian Høgsberg1-7/+5
This fixes a problem where texturing from the same Pixmap more than once per batchbuffer would hang the DRI driver. We just use the region associated with the front left renderbuffer of the __DRIdrawable for texturing, which avoids creating different regions for the same BO. This change also make GLX_EXT_texture_from_pixmap work for direct rendering, since tracking the __DRIdrawable -> BO handle now uses the standard DRI2 event buffer. Of course, DRI2 direct rendering doesn't exist yet. Finally, this commit bumps the DRI interface version again, accounting for the change in the DRI_TEX_BUFFER extension and the change in commit 0bba0e5be7a4a7275dad1edc34bdcc134ea1f424 to pass in the event buffer head index on drawable creation.
2008-03-09DRI2: Add event buffer head as an argument to driCreateNewDrawable().Kristian Høgsberg1-0/+1
The DRI driver needs to know where in the buffer to start reading.
2008-03-03[dri2] Add tail pointer to reemitDrawableInfo callback.Kristian Høgsberg1-1/+2
When the DRI doesn't parse the event buffer for a while, the X server may overwrite data that the driver didn't get a chance to look at. The reemitDrawableInfo callback requests that the X server reemit all info for the specified drawable. To make use of this, the drive needs to know the new tail pointer so it know where to start reading from.
2008-02-29Use __DRIextension mechanism providing loader functionality to the driver.Kristian Høgsberg1-22/+60
Instead of passing in a fixed struct, the loader now passes in a list of __DRIextension structs, to advertise the functionality it can provide to the driver. Each extension is individually versioned and can be extended or phased out as the interface develops.
2008-02-29Reduce the versioning madness required to create a DRI2 screen.Kristian Høgsberg1-5/+2
Right now the DRI2 screen constructor takes 3 different versions: DRI, DDX and DRM. This is mostly useless, though: DRI: The DRI driver doesn't actually care about the DRI protocol, it only talks to the loader, which in turn speaks DRI protocol. Thus, the DRI protocol version is of not interest to the DRI driver, but it needs to know what functionality the loader provides. At this point that's reflected in the __DRIinterfaceMethods struct and the internal_version integer. DDX: The DDX version number is essentially used to track extensions to the SAREA. With DRI2 the SAREA consists of a number of versioned, self-describing blocks, so the DDX version is no longer interesting. DRM: We have the fd, lets just ask the kernel ourselves.
2008-02-28Convert crlf->lf line endings.José Fonseca1-79/+79
Windows/DOS users should enable core.autocrlf from now on: git config --global core.autocrlf true
2008-02-25Remove GetMSC DriverAPI function.Kristian Høgsberg1-13/+2
The DriverAPI is internal to the DRI drivers and GetDrawableMSC obsoletes GetMSC. Also, since the DRI driver interface has not yet been released, just drop the getMSC function from the DRI interface instead using the ABI preserving version mechanism. Finally, using void pointer privates in the DRI interface is not allowed, always pass the actual types around (__DRIdrawable in this case) to enhance type safety and readability of the code.
2008-02-14Add TTM buffer object based texture from pixmap implementation.Kristian Høgsberg1-0/+20
Currently only implemented for intel hw.
2008-02-14Add new DRI2 infrastructure.Kristian Høgsberg2-6/+163
2007-11-05Fix GLX build of xserver master branch.Michel Dänzer1-0/+5
The internal CreatePixmap API has been extended.
2007-10-29Refactor and fix core vblank supportJesse Barnes1-1/+13
Consolidate support for synchronizing to and retrieving vblank counters. Also fix the core vblank code to return monotonic MSC counters, which are required by some GLX extensions. Adding support for multiple pipes to a low level driver is fairly easy, the Intel 965 driver provides simple example code (see intel_buffers.c:intelWindowMoved()). The new code bumps the media stream counter extension version to 2 and adds a new getDrawableMSC callback. This callback takes a drawablePrivate pointer, which is used to calculate the MSC value seen by clients based on the actual vblank counter(s) returned from the kernel. The new drawable private fields are as follows: - vblSeq - used for tracking vblank counts for buffer swapping - vblFlags - flags (e.g. current pipe), updated by low level driver - msc_base - MSC counter from the last time the current pipe changed - vblank_base - kernel DRM vblank counter from the last time the pipe changed Using the above variables, the core vblank code (in vblank.c) can calculate a monotonic MSC value. The low level DRI drivers are responsible for updating the current pipe (by setting VBLANK_FLAG_SECONDARY for example in vblFlags) along with msc_base and vblank_base whenever the pipe associated with a given drawable changes (again, see intelWindowMoved for an example of this). Drivers should fill in the GetDrawableMSC DriverAPIRec field to point to driDrawableGetMSC32 and add code for pipe switching as outlined above to fully support the new scheme.
2007-10-14Add GL_CORE_WINDOWS define to glcore.hGeorge Sapountzis1-0/+1
This is for consistency with glproto. The GL_CORE defines should probably be dropped. ---- Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> Date: Mon Jun 21 13:35:05 2004 +0000 Bug 782: Merge native OpenGL for Windows from CYGWIN branch
2007-10-11Add a version field to __DRIextension.Kristian Høgsberg1-0/+23
2007-10-11Move new texOffset extension to the new extension mechanism.Kristian Høgsberg1-12/+17
2007-10-11Convert a left-over private void * to __DRIcontext *.Kristian Høgsberg1-1/+1
2007-10-11Remove now unused getProcAddress from DRIinterfaceMethods.Kristian Høgsberg1-38/+0
2007-10-11Add a DRI_ReadDrawable marker extension to signal read drawable capability.Kristian Høgsberg1-0/+5
2007-10-11Move media stream counter entry points to new extension.Kristian Høgsberg1-49/+27
2007-10-11Move GLX_MESA_swap_frame_usage DRI entry points to the new mechanism.Kristian Høgsberg1-16/+25
2007-10-11Move GLX_MESA_allocate_memory related functions to new extension mechanism.Kristian Høgsberg1-16/+18
2007-10-10Move swap_interval to new extension mechanism.Kristian Høgsberg1-8/+11
2007-10-10Move the copySubBuffer extension over to the new mechanism.Kristian Høgsberg1-8/+10
2007-10-10Implement new screen extension API.Kristian Høgsberg1-0/+20
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.
2007-10-10Stop passing in unused fbconfigs to createNewScreen.Kristian Høgsberg1-1/+0
2007-10-10Convert all DRI entrypoints to take pointers to __DRI* types.Kristian Høgsberg1-20/+20
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.
2007-10-10Remove screenConfigs from __DRIscreen.Kristian Høgsberg1-11/+2
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.
2007-10-10Drop mostly unused __DRIid typedef.Kristian Høgsberg1-1/+0
2007-10-10Drop createContext and destroyContext from DRIinterfaceMethods.Kristian Høgsberg1-12/+2
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.
2007-10-10Drop createDrawable and destroyDrawable fron DRIinterfaceMethods.Kristian Høgsberg1-13/+3
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.
2007-10-10Drop __DRInativeDisplay and pass in __DRIscreen pointers instead.Kristian Høgsberg1-42/+33
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.
2007-10-05Add macros to generate CreateNewScreen entrypoint.Kristian Høgsberg1-1/+19
2007-10-05Remove XIDs from DRI interface (see #5714).Kristian Høgsberg1-38/+17
2007-09-12Add glut_fcb.c to the build and update to fix warnings (see bug 12405)Brian1-2/+2
2007-08-23Unbreak Linux builds with -fvisibility=hidden.Adam Jackson1-16/+11
2007-07-27more Mingw32 fixesZhang3-9/+2
2007-07-21Fix a number of MINGW32 issuesZhang3-38/+47