--- Ian Romanick <[EMAIL PROTECTED]> wrote:
The next step is to remove the one place where glxclient.h is still used (in dri_util.h). This means some clean-up is need in glcontextmodes.[ch]. That's the easy part. The harder part is dealing with the various GLX_ defines used around the code (mostly in glcontextmodes.c, but also other places). I'm thinking that we need to import a version of glxtokens.h into the Mesa tree. Does that sound acceptable to all involved?
Is it possible to remove all of the GLX dependencies from drivers/dri/...? In
drivers/dri/... we could use non-GLX types then in mesa/src/glx/X you could add
whatever code was necessary to support GLX.
I think I fixed miniglx to work this way. I restricted the glx header imports to the miniglx directory and then chopped up the files so that drivers/dri/.... never saw glx.
glxtokens.h contains *only* enum values. It doesn't include any other files, contain any types, contain any prototypes, or do any other cruft like that. It's just a bunch of #defines. :)
There are two sets of GLX things that are still used in the code. A few places use GLX error values (i.e., GLX_BAD_CONTEXT), and glcontextmodes.c uses GLX enums for visual properties. In glcontextmodes.c, there are two sets of values that are used. _gl_get_context_mode_data uses a *ton* of different enums to specify which property is being queried. Other routines use a few enums (i.e., GLX_NONE, GLX_DONT_CARE, etc.) as values for structure fields.
It looks like _gl_get_context_mode_data, which is primarilly used to implement glXGetFBConfigAttrib and the like, isn't need to build the drivers. That still leaves a handful of other values. I'd prefer to not need to map values to support GLX, so the same numerical values should be kept. Just using a local copy of glxtokens.h seems like the easiest route to go.
What are your thoughts on that?
------------------------------------------------------- This SF.Net email is sponsored by the new InstallShield X.
From Windows to Linux, servers to mobile, InstallShield X is the one
installation-authoring solution that does it all. Learn more and evaluate today! http://www.installshield.com/Dev2Dev/0504 -- _______________________________________________ Dri-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/dri-devel
