Commit Graph

426 Commits

Author SHA1 Message Date
Karl Schultz
f66084b834 Add support for memory contexts (Thomas Kaltofen). Cleanup compilation warnings. 2005-09-05 14:48:39 +00:00
Brian Paul
c799e9ec24 added GL_EXT_timer_query token 2005-09-02 13:43:26 +00:00
Brian Paul
160b3284dd include stdint.h if WIN32 and GNUC (Colin Harrison). Patch forwarded to SGI. 2005-08-15 23:25:33 +00:00
Ian Romanick
68679d2b9e Remove '#if 0' block that was accidentally left in. 2005-07-28 20:55:26 +00:00
Ian Romanick
1585c234e0 Major rip-up of internal function insertion interface. The old
_glapi_add_entrypoint has been replaced by a new routine called
_glapi_add_dispatch.  This new routine dynamically assignes dispatch offsets
to functions added.  This allows IHVs to add support for extension functions
that do not have assigned dispatch offsets.

It also means that a driver has no idea what offset will be assigned to a
function.  The vast majority of the changes in this commit account for that.
An additional table, driDispatchRemapTable, is added.  Functions not in the
Linux OpenGL ABI (i.e., anything not in GL 1.2 + ARB_multitexture) has a
fixed offset in this new table.  The entry in this table specifies the
offset in of the function in the real dispatch table.

The internal interface was also bumped from version 20050725 to 20050727.

This has been tested with various programs in progs/demos on:

radeon (Radeon Mobility M6)
r128 (Rage 128 Pro)
mga (G400)
2005-07-28 00:29:51 +00:00
Ian Romanick
9f23a3a1bf Fix SPARC assembly for 64-bit
- The test for whether or not we're building for 64-bit is '#ifdef __arch64__'.
 This appears to be correct on both Linux and Solaris.

- The test for Solaris is now '#if defined(SVR4) || defined(__SVR4) ||
defined(__svr4__)'.  GCC 3.4.0 has all three defined on Solaris 9.

- Enables assembly language clip routines.

- Fixes to make GLSL code build on Solaris.

- Update gl_SPARC_asm.py.
2005-07-28 00:11:10 +00:00
Ian Romanick
5c6fd3dd4c No, really, get rid of all the remaining references to DRI_USE_NEW_INTERFACE.
A couple other remnants of the old interfaces hit the dust too.  Thanks
Jon. :)
2005-07-26 05:57:24 +00:00
Ian Romanick
5f1ba3e21b Fixes the glXGetProcAddress portion of the interface. Most of the functions
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...
2005-07-26 02:44:01 +00:00
Ian Romanick
e9dbe58b8b Gut a few more dead bits. Replace uses of the CreateNewScreenFunc typedef
(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.
2005-07-24 07:38:23 +00:00
Ian Romanick
c39bf5e273 All elements of pre-DRI_NEW_INTERFACE_ONLY are removed. This allows
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.
2005-07-24 06:29:14 +00:00
Brian Paul
23606a5704 updated to version 29 2005-06-21 14:30:46 +00:00
Brian Paul
ee7ad16f3f regenerated 2005-06-08 13:35:28 +00:00
Brian Paul
2c7336af4e put full prototype on one line to fix gl_mangle.h generation (Dave Reveman) 2005-06-08 13:35:07 +00:00
Brian Paul
012de39c23 remove stray line 2005-06-08 13:07:33 +00:00
Brian Paul
d45cb9a836 regenerate for latest glext.h 2005-06-08 02:18:22 +00:00
Brian Paul
5d5100aabc remove temporary GL_EXT_framebuffer_object info 2005-05-31 23:54:44 +00:00
Brian Paul
2e081cd90e updated to version 28 2005-05-31 23:54:24 +00:00
Karl Schultz
db21f1c84f The "P" suffix on APIENTRY and GLAPIENTRY is to be used for pointers to
functions, not for functions that return pointers.  Restore protoype
for glGetString back to its correct form.
2005-05-11 22:01:20 +00:00
Brian Paul
e4b2356c07 Major check-in of changes for GL_EXT_framebuffer_object extension.
Main driver impacts:
- new code for creating the Mesa GLframebuffer
- new span/pixel read/write code
Some drivers not yet updated/tested.
2005-05-04 20:11:35 +00:00
Dave Airlie
9bfd9582d4 bring over structs from Xorg glx.h to make Mesa glx.h the one true glx.h 2005-02-26 03:55:44 +00:00
Dave Airlie
24dcc6b6bf Add GLX_MESA_allocate_memory from Xorg glx.h 2005-02-26 03:51:17 +00:00
Dave Airlie
dee1c795c2 add more functionality to miniglx for glitz 2005-02-20 10:46:34 +00:00
Brian Paul
f321f16e83 fix non-Win32 definition of GLUTAPIENTRY, remove some cruft 2005-02-16 19:52:35 +00:00
Dave Airlie
09298228c6 add EnableExtension so r200 enables all its extensions, add mesa memory
extension entry points
2005-02-15 08:40:24 +00:00
Adam Jackson
d084982240 Bug #2477: Make GLU/GLw/glut build properly even with -fvisibility=hidden. 2005-02-08 05:46:53 +00:00
Brian Paul
cf69e051ce added GL_EXT_framebuffer_object enums/funcs. Remove when glext.h is updated 2005-02-08 03:45:08 +00:00
Ian Romanick
5b0dd89370 remove a bunch of temporary #defines, now that glext.h was updated 2005-01-26 19:19:06 +00:00
Brian Paul
1060211918 fix glGetString funniness 2005-01-21 16:35:56 +00:00
Brian Paul
14dee36fa7 glext.h version 26 2005-01-20 15:07:42 +00:00
Brian Paul
5255044c00 added a few OpenGL 2.0 tokens (temporary) 2005-01-16 19:40:15 +00:00
Brian Paul
d7b837ad4a temporary prototypes for OpenGL 2.0 2005-01-12 04:06:55 +00:00
Brian Paul
85edffd5ff added GLX_NV_float_buffer 2005-01-04 14:48:14 +00:00
Brian Paul
81ca616e7e DirectFB driver (Claudio Ciccani) 2005-01-03 15:35:00 +00:00
Brian Paul
538541e300 VMS update 2004-12-17 14:48:00 +00:00
Daniel Borca
8b563fd4c5 added DMesaProc type to prevent gcc 3.4.3 warnings 2004-12-15 07:55:38 +00:00
Alan Hourihane
38b317d508 uint*t -> u_int*t changes 2004-12-14 09:11:52 +00:00
Alan Hourihane
8635615501 Check for some header defines before redefining functions. Silences warnings. 2004-12-08 12:59:15 +00:00
Brian Paul
bf4c23d00f no need to include stddef.h anymore 2004-11-29 17:31:03 +00:00
Brian Paul
4d880987d2 Have OSMesaGetProcAddress() return new OSMESAproc typedef. 2004-11-27 16:24:39 +00:00
Brian Paul
2dd5b9edaa typedef GLUTproc, return it from glutGetProcAddress() 2004-11-27 04:54:48 +00:00
Brian Paul
b653aaede5 minor APIENTRY clean-ups 2004-11-25 23:20:07 +00:00
Brian Paul
83889ffd97 Remove need for defining _MSC_VER when building Mesa for windows with
a non MS C compiler (MinGW).  (Gregor Anich)
2004-11-08 15:08:48 +00:00
Adam Jackson
bcd8735546 Import sarea.h from Xorg, needed for client GLX code. 2004-10-25 20:52:11 +00:00
Ian Romanick
33899b7c35 Add support for OES_read_format. As soon as glext.h is updated with the
enums for this extension, the changes to gl.h can be removed.
2004-10-16 01:16:54 +00:00
Daniel Borca
65a9ca3381 bump version numbers to their real values 2004-10-12 06:43:57 +00:00
Brian Paul
788ff5b5c7 remove unused413 stuff, glDrawBuffersARB uses that slot now 2004-10-02 22:47:48 +00:00
Brian Paul
be91a0be58 version bump 2004-09-27 22:40:31 +00:00
Brian Paul
4f1e3709de change include of glx_mangle.h to match other headers 2004-09-27 22:40:22 +00:00
Brian Paul
d86d1483ac Another attempt at fixing name mangling and gl__unused413(). 2004-09-09 18:13:35 +00:00
Brian Paul
a6c423d956 Silence gcc 3.4 warnings on ReactOS. Mostly unused var warnings. (patch 1015696) 2004-08-25 15:59:48 +00:00
Brian Paul
6ade8a36b6 version 6 from oss.sgi.com 2004-07-28 13:23:11 +00:00
Brian Paul
196fb036d6 version 24 from oss.sgi.com 2004-07-28 13:22:46 +00:00
Jon Smirl
c2bffec91a Mesa-solo builds with these changes. There are still more fixups needed to
get individual drivers working again. This converts miniglx to the new
dri interface. Thanks to Erdi Chen for the new interface code.
2004-06-26 17:16:42 +00:00
Brian Paul
e4fbcd0fca updated to version 23 2004-06-23 14:48:04 +00:00
Brian Paul
6b869d4fe1 Alexander Gottwald's patch for cygwin 2004-06-22 17:16:02 +00:00
Ian Romanick
e1a7f31c2b Remove the rest of the need for glxclient.h and remove it from the tree. 2004-06-06 02:20:20 +00:00
Jon Smirl
ba3d643c49 kill __driRegisterExtensions(), none of the functions did anything 2004-06-03 01:56:07 +00:00
Ian Romanick
749e842953 Replace Bool with GLboolean. 2004-06-02 20:46:03 +00:00
Ian Romanick
318aa84099 XF86DRIDestroyContext, XF86DRICreateDrawable, and
XF86DRIDestroyDrawable are all called directly from DRI drivers using
the new interface.  Therefore, prototypes, using available datatypes,
must be available in dri_interface.h.  Since the prototypes are
available there, xf86dri.h is no longer needed for
DRI_NEW_INTERFACE_ONLY builds.
2004-06-02 17:37:09 +00:00
Ian Romanick
60b0e12830 Convert 'Display *' to '__DRInativeDisplay *'. Only portions of the
interface that are not *strictly* part of the old interface were
changed.  Replace GetDrawableInfo type (dri_util.h) with
PFNGLXGETDRAWABLEINFOPROC (dri_interface.h).  Wrap __driCreateScreen
(in drivers that use the new interface) with '#ifndef
DRI_NEW_INTERFACE_ONLY'.
2004-06-01 20:24:59 +00:00
Ian Romanick
fabe2b9ba3 Replace all occurances of XF86DRIClipRect (and related typedefs) with
drm_clip_rect_t.
2004-06-01 16:38:56 +00:00
Brian Paul
27eb8fa35a remove duplicate GLX_DRAWABLE_TYPE token, sorted tokens by enum value 2004-05-21 15:51:13 +00:00
Keith Whitwell
74d563cdfb Allow *_dri.so to build in Mesa tree with the 'linux-dri' target. 2004-04-29 12:23:39 +00:00
Brian Paul
199972cef0 move #define for GL_DOUBLE, to put enums in right order 2004-04-23 18:00:00 +00:00
Ian Romanick
ab37fddbfd Correct the comments about when the bindContext3 / unbindContext3
interface was added.
2004-04-15 01:24:57 +00:00
Brian Paul
5eb921382f added extern "C" for C++ (bug 930933) 2004-04-09 17:18:22 +00:00
Brian Paul
fda7215db3 rename class to c_class if using C++ (bug 922294) 2004-03-24 15:59:44 +00:00
Brian Paul
192c988c73 new DRI interface header 2004-03-22 23:31:29 +00:00
Brian Paul
ff6031c209 remove some unneeded macros 2004-03-04 16:20:38 +00:00
Brian Paul
0adce8f7c7 upgraded to version 22 2004-02-24 03:01:27 +00:00
Ian Romanick
304d3aa9cb Refactored several variables out of XMesaVisual in favor of identical
fields in __GLcontextModes (the base type).  Removed the need to keep
the XMesaVisualInfo pointer when building inside the X-server.
2004-02-19 00:57:04 +00:00
Daniel Borca
22633805fa fixed back fxMesaGetCurrentContext to match MakeCurrent 2004-02-10 07:46:07 +00:00
Daniel Borca
d039b43e30 added NUL driver for DMesa 2004-02-07 10:54:36 +00:00
Brian Paul
1f3d9eedad added GLU_INCOMPATIBLE_GL_VERSION 2004-02-06 01:17:30 +00:00
Brian Paul
c2f739169e update function mangling and add comment about it to gl.h 2004-02-05 15:23:12 +00:00
Ian Romanick
74cf25b081 Missed this commit as part of the addition of
GL_EXT_blend_equation_separate / GL_ATI_blend_equation_separate.
2004-01-27 21:40:35 +00:00
Daniel Borca
3d06dc7581 accomodated new driver_func initialization
added DMesaGetProcAddress
some other minor fixes
updated documentation
2004-01-23 15:57:52 +00:00
Brian Paul
cdde03efe2 remove stuff that's now in glext.h 2004-01-13 02:04:57 +00:00
Brian Paul
c661cccf37 updated to version 21 with OpenGL 1.5 support 2004-01-13 01:54:03 +00:00
Brian Paul
cf75101bba regenerated to support new 1.5 functions, etc. 2004-01-09 20:34:04 +00:00
Daniel Borca
e9e98405e7 DMesa: removed MGA2064W driver
DMesa: added capability to query visuals
fxMesa: WGL_3DFX_gamma_control
fxMesa: minor fixes to interface (fxQueryHardware vs fxMesaSelect...)
2003-12-19 11:26:46 +00:00
Alan Hourihane
3b81ccd826 fix for C++ 2003-12-12 22:35:02 +00:00
Brian Paul
c3fb2558f0 replace gl/mesa_wgl.h with GL/mesa_wgl.h (Simon Goodall) 2003-12-11 23:55:55 +00:00
Keith Whitwell
e0ee87422b Quash annoying compiler warning 2003-12-11 15:47:43 +00:00
Keith Whitwell
a9fc4b1b1c Remove dead file glcore-new.h 2003-12-11 13:10:20 +00:00
Alan Hourihane
18343db1d8 reverse Keith's 'XFree86Server' glue. 2003-12-08 16:57:21 +00:00
Keith Whitwell
3abad78e26 Can't include <stddef.h> when building XFree86 server - define
ptrdiff_t to int instead
2003-12-08 15:00:24 +00:00
Brian Paul
a763123b35 glFBDev driver from embedded-2 branch.
Probably won't be actively used/maintained, but bring it to the trunk so
it doesn't get lost.
2003-12-06 17:20:10 +00:00
Brian Paul
fde2b9750e basic API work for FBConfigs & Pbuffers 2003-12-06 17:17:42 +00:00
Brian Paul
78c5841364 s/APIENTRY/GLAPIENTRY/ for 1.5 functions 2003-12-06 01:49:54 +00:00
Alan Hourihane
faf4059aa8 check if GLAPIENTRYP is already set 2003-12-04 15:59:41 +00:00
Alan Hourihane
f82c775fff #define GLAPIENTRYP GLAPIENTRY * 2003-12-04 15:59:03 +00:00
Alan Hourihane
3eb58b4c1e bring over glcore.h changes from DRI trunk 2003-12-04 12:33:15 +00:00
Brian Paul
91b6a4aa90 include malloc.h to get ptrdiff_t for vertex buffer object's GLintptr 2003-11-23 16:22:54 +00:00
Brian Paul
67f8a1d4ad added OpenGL 1.5 tokens and functions not yet put into glext.h 2003-11-22 18:44:10 +00:00
Brian Paul
20f40fa427 minor fix to glutSetColor prototype (Evgeny Kotsuba) 2003-10-27 18:33:34 +00:00
Daniel Borca
1b6cca67b5 documentation update; also new makefiles for Win32 MesaFX build 2003-10-21 11:15:52 +00:00
Karl Schultz
906449753f Define GLAPIENTRYP properly so that GLU compiles on Windows. 2003-10-20 17:36:41 +00:00
Brian Paul
3eb0edb31f added GL_ARB_point_sprite tokens 2003-10-16 16:33:05 +00:00
Jon Smirl
3fc0db95e4 Minor changes to make linux-solo build again 2003-10-16 04:50:42 +00:00