glx: indent -br -i3 -npcs --no-tabs dri_glx.c
This commit is contained in:
parent
09c889b318
commit
4e88ae5639
|
@ -51,7 +51,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
typedef struct __GLXDRIdisplayPrivateRec __GLXDRIdisplayPrivate;
|
||||
typedef struct __GLXDRIcontextPrivateRec __GLXDRIcontextPrivate;
|
||||
|
||||
struct __GLXDRIdisplayPrivateRec {
|
||||
struct __GLXDRIdisplayPrivateRec
|
||||
{
|
||||
__GLXDRIdisplay base;
|
||||
|
||||
/*
|
||||
|
@ -62,7 +63,8 @@ struct __GLXDRIdisplayPrivateRec {
|
|||
int driPatch;
|
||||
};
|
||||
|
||||
struct __GLXDRIcontextPrivateRec {
|
||||
struct __GLXDRIcontextPrivateRec
|
||||
{
|
||||
__GLXDRIcontext base;
|
||||
__DRIcontext *driContext;
|
||||
XID hwContextID;
|
||||
|
@ -74,7 +76,8 @@ struct __GLXDRIcontextPrivateRec {
|
|||
* the DRI driver for the screen. (I.e. "r128", "tdfx", etc).
|
||||
* Return True for success, False for failure.
|
||||
*/
|
||||
static Bool driGetDriverName(Display *dpy, int scrNum, char **driverName)
|
||||
static Bool
|
||||
driGetDriverName(Display * dpy, int scrNum, char **driverName)
|
||||
{
|
||||
int directCapable;
|
||||
Bool b;
|
||||
|
@ -110,17 +113,19 @@ static Bool driGetDriverName(Display *dpy, int scrNum, char **driverName)
|
|||
* The returned char pointer points to a static array that will be
|
||||
* overwritten by subsequent calls.
|
||||
*/
|
||||
PUBLIC const char *glXGetScreenDriver (Display *dpy, int scrNum) {
|
||||
PUBLIC const char *
|
||||
glXGetScreenDriver(Display * dpy, int scrNum)
|
||||
{
|
||||
static char ret[32];
|
||||
char *driverName;
|
||||
if (driGetDriverName(dpy, scrNum, &driverName)) {
|
||||
int len;
|
||||
if (!driverName)
|
||||
return NULL;
|
||||
len = strlen (driverName);
|
||||
len = strlen(driverName);
|
||||
if (len >= 31)
|
||||
return NULL;
|
||||
memcpy (ret, driverName, len+1);
|
||||
memcpy(ret, driverName, len + 1);
|
||||
Xfree(driverName);
|
||||
return ret;
|
||||
}
|
||||
|
@ -138,18 +143,20 @@ PUBLIC const char *glXGetScreenDriver (Display *dpy, int scrNum) {
|
|||
*
|
||||
* Note: The driver remains opened after this function returns.
|
||||
*/
|
||||
PUBLIC const char *glXGetDriverConfig (const char *driverName)
|
||||
PUBLIC const char *
|
||||
glXGetDriverConfig(const char *driverName)
|
||||
{
|
||||
void *handle = driOpenDriver (driverName);
|
||||
void *handle = driOpenDriver(driverName);
|
||||
if (handle)
|
||||
return dlsym (handle, "__driConfigOptions");
|
||||
return dlsym(handle, "__driConfigOptions");
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef XDAMAGE_1_1_INTERFACE
|
||||
|
||||
static GLboolean has_damage_post(Display *dpy)
|
||||
static GLboolean
|
||||
has_damage_post(Display * dpy)
|
||||
{
|
||||
static GLboolean inited = GL_FALSE;
|
||||
static GLboolean has_damage;
|
||||
|
@ -158,10 +165,10 @@ static GLboolean has_damage_post(Display *dpy)
|
|||
int major, minor;
|
||||
|
||||
if (XDamageQueryVersion(dpy, &major, &minor) &&
|
||||
major == 1 && minor >= 1)
|
||||
{
|
||||
major == 1 && minor >= 1) {
|
||||
has_damage = GL_TRUE;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
has_damage = GL_FALSE;
|
||||
}
|
||||
inited = GL_TRUE;
|
||||
|
@ -170,11 +177,11 @@ static GLboolean has_damage_post(Display *dpy)
|
|||
return has_damage;
|
||||
}
|
||||
|
||||
static void __glXReportDamage(__DRIdrawable *driDraw,
|
||||
static void
|
||||
__glXReportDamage(__DRIdrawable * driDraw,
|
||||
int x, int y,
|
||||
drm_clip_rect_t *rects, int num_rects,
|
||||
GLboolean front_buffer,
|
||||
void *loaderPrivate)
|
||||
drm_clip_rect_t * rects, int num_rects,
|
||||
GLboolean front_buffer, void *loaderPrivate)
|
||||
{
|
||||
XRectangle *xrects;
|
||||
XserverRegion region;
|
||||
|
@ -192,7 +199,8 @@ static void __glXReportDamage(__DRIdrawable *driDraw,
|
|||
x_off = x;
|
||||
y_off = y;
|
||||
drawable = RootWindow(dpy, psc->scr);
|
||||
} else{
|
||||
}
|
||||
else {
|
||||
x_off = 0;
|
||||
y_off = 0;
|
||||
drawable = glxDraw->xDrawable;
|
||||
|
@ -215,19 +223,20 @@ static void __glXReportDamage(__DRIdrawable *driDraw,
|
|||
}
|
||||
|
||||
static const __DRIdamageExtension damageExtension = {
|
||||
{ __DRI_DAMAGE, __DRI_DAMAGE_VERSION },
|
||||
{__DRI_DAMAGE, __DRI_DAMAGE_VERSION},
|
||||
__glXReportDamage,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
static GLboolean
|
||||
__glXDRIGetDrawableInfo(__DRIdrawable *drawable,
|
||||
__glXDRIGetDrawableInfo(__DRIdrawable * drawable,
|
||||
unsigned int *index, unsigned int *stamp,
|
||||
int *X, int *Y, int *W, int *H,
|
||||
int *numClipRects, drm_clip_rect_t ** pClipRects,
|
||||
int *backX, int *backY,
|
||||
int *numBackClipRects, drm_clip_rect_t **pBackClipRects,
|
||||
int *numBackClipRects,
|
||||
drm_clip_rect_t ** pBackClipRects,
|
||||
void *loaderPrivate)
|
||||
{
|
||||
__GLXDRIdrawable *glxDraw = loaderPrivate;
|
||||
|
@ -242,7 +251,7 @@ __glXDRIGetDrawableInfo(__DRIdrawable *drawable,
|
|||
}
|
||||
|
||||
static const __DRIgetDrawableInfoExtension getDrawableInfoExtension = {
|
||||
{ __DRI_GET_DRAWABLE_INFO, __DRI_GET_DRAWABLE_INFO_VERSION },
|
||||
{__DRI_GET_DRAWABLE_INFO, __DRI_GET_DRAWABLE_INFO_VERSION},
|
||||
__glXDRIGetDrawableInfo
|
||||
};
|
||||
|
||||
|
@ -271,7 +280,7 @@ static const __DRIextension *loader_extensions[] = {
|
|||
* the client-side driver on success, or \c NULL on failure.
|
||||
*/
|
||||
static void *
|
||||
CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
||||
CallCreateNewScreen(Display * dpy, int scrn, __GLXscreenConfigs * psc,
|
||||
__GLXDRIdisplayPrivate * driDpy)
|
||||
{
|
||||
void *psp = NULL;
|
||||
|
@ -344,8 +353,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
if (!XF86DRIGetClientDriverName(dpy, scrn,
|
||||
&ddx_version.major,
|
||||
&ddx_version.minor,
|
||||
&ddx_version.patch,
|
||||
&driverName)) {
|
||||
&ddx_version.patch, &driverName)) {
|
||||
ErrorMessageF("XF86DRIGetClientDriverName failed\n");
|
||||
goto handle_error;
|
||||
}
|
||||
|
@ -360,7 +368,8 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
*/
|
||||
if (!XF86DRIGetDeviceInfo(dpy, scrn, &hFB, &junk,
|
||||
&framebuffer.size, &framebuffer.stride,
|
||||
&framebuffer.dev_priv_size, &framebuffer.dev_priv)) {
|
||||
&framebuffer.dev_priv_size,
|
||||
&framebuffer.dev_priv)) {
|
||||
ErrorMessageF("XF86DRIGetDeviceInfo failed");
|
||||
goto handle_error;
|
||||
}
|
||||
|
@ -370,7 +379,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
|
||||
/* Map the framebuffer region. */
|
||||
status = drmMap(fd, hFB, framebuffer.size,
|
||||
(drmAddressPtr)&framebuffer.base);
|
||||
(drmAddressPtr) & framebuffer.base);
|
||||
if (status != 0) {
|
||||
ErrorMessageF("drmMap of framebuffer failed (%s)", strerror(-status));
|
||||
goto handle_error;
|
||||
|
@ -385,7 +394,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
goto handle_error;
|
||||
}
|
||||
|
||||
psp = (*psc->legacy->createNewScreen)(scrn,
|
||||
psp = (*psc->legacy->createNewScreen) (scrn,
|
||||
&ddx_version,
|
||||
&dri_version,
|
||||
&drm_version,
|
||||
|
@ -393,8 +402,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
pSAREA,
|
||||
fd,
|
||||
loader_extensions,
|
||||
&driver_configs,
|
||||
psc);
|
||||
&driver_configs, psc);
|
||||
|
||||
if (psp == NULL) {
|
||||
ErrorMessageF("Calling driver entry point failed");
|
||||
|
@ -411,7 +419,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
drmUnmap(pSAREA, SAREA_MAX);
|
||||
|
||||
if (framebuffer.base != MAP_FAILED)
|
||||
drmUnmap((drmAddress)framebuffer.base, framebuffer.size);
|
||||
drmUnmap((drmAddress) framebuffer.base, framebuffer.size);
|
||||
|
||||
if (framebuffer.dev_priv != NULL)
|
||||
Xfree(framebuffer.dev_priv);
|
||||
|
@ -429,7 +437,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
#else /* !GLX_USE_APPLEGL */
|
||||
|
||||
static void *
|
||||
CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
||||
CallCreateNewScreen(Display * dpy, int scrn, __GLXscreenConfigs * psc,
|
||||
__GLXDRIdisplayPrivate * driDpy)
|
||||
{
|
||||
return NULL;
|
||||
|
@ -437,40 +445,42 @@ CallCreateNewScreen(Display *dpy, int scrn, __GLXscreenConfigs *psc,
|
|||
|
||||
#endif /* !GLX_USE_APPLEGL */
|
||||
|
||||
static void driDestroyContext(__GLXDRIcontext *context,
|
||||
__GLXscreenConfigs *psc, Display *dpy)
|
||||
static void
|
||||
driDestroyContext(__GLXDRIcontext * context,
|
||||
__GLXscreenConfigs * psc, Display * dpy)
|
||||
{
|
||||
__GLXDRIcontextPrivate *pcp = (__GLXDRIcontextPrivate *) context;
|
||||
|
||||
(*psc->core->destroyContext)(pcp->driContext);
|
||||
(*psc->core->destroyContext) (pcp->driContext);
|
||||
|
||||
XF86DRIDestroyContext(psc->dpy, psc->scr, pcp->hwContextID);
|
||||
Xfree(pcp);
|
||||
}
|
||||
|
||||
static Bool driBindContext(__GLXDRIcontext *context,
|
||||
__GLXDRIdrawable *draw, __GLXDRIdrawable *read)
|
||||
static Bool
|
||||
driBindContext(__GLXDRIcontext * context,
|
||||
__GLXDRIdrawable * draw, __GLXDRIdrawable * read)
|
||||
{
|
||||
__GLXDRIcontextPrivate *pcp = (__GLXDRIcontextPrivate *) context;
|
||||
const __DRIcoreExtension *core = pcp->psc->core;
|
||||
|
||||
return (*core->bindContext)(pcp->driContext,
|
||||
draw->driDrawable,
|
||||
read->driDrawable);
|
||||
return (*core->bindContext) (pcp->driContext,
|
||||
draw->driDrawable, read->driDrawable);
|
||||
}
|
||||
|
||||
static void driUnbindContext(__GLXDRIcontext *context)
|
||||
static void
|
||||
driUnbindContext(__GLXDRIcontext * context)
|
||||
{
|
||||
__GLXDRIcontextPrivate *pcp = (__GLXDRIcontextPrivate *) context;
|
||||
const __DRIcoreExtension *core = pcp->psc->core;
|
||||
|
||||
(*core->unbindContext)(pcp->driContext);
|
||||
(*core->unbindContext) (pcp->driContext);
|
||||
}
|
||||
|
||||
static __GLXDRIcontext *driCreateContext(__GLXscreenConfigs *psc,
|
||||
const __GLcontextModes *mode,
|
||||
GLXContext gc,
|
||||
GLXContext shareList, int renderType)
|
||||
static __GLXDRIcontext *
|
||||
driCreateContext(__GLXscreenConfigs * psc,
|
||||
const __GLcontextModes * mode,
|
||||
GLXContext gc, GLXContext shareList, int renderType)
|
||||
{
|
||||
__GLXDRIcontextPrivate *pcp, *pcp_shared;
|
||||
drm_context_t hwContext;
|
||||
|
@ -498,12 +508,9 @@ static __GLXDRIcontext *driCreateContext(__GLXscreenConfigs *psc,
|
|||
}
|
||||
|
||||
pcp->driContext =
|
||||
(*psc->legacy->createNewContext)(psc->__driScreen,
|
||||
(*psc->legacy->createNewContext) (psc->__driScreen,
|
||||
config->driConfig,
|
||||
renderType,
|
||||
shared,
|
||||
hwContext,
|
||||
pcp);
|
||||
renderType, shared, hwContext, pcp);
|
||||
if (pcp->driContext == NULL) {
|
||||
XF86DRIDestroyContext(psc->dpy, psc->scr, pcp->hwContextID);
|
||||
Xfree(pcp);
|
||||
|
@ -517,19 +524,20 @@ static __GLXDRIcontext *driCreateContext(__GLXscreenConfigs *psc,
|
|||
return &pcp->base;
|
||||
}
|
||||
|
||||
static void driDestroyDrawable(__GLXDRIdrawable *pdraw)
|
||||
static void
|
||||
driDestroyDrawable(__GLXDRIdrawable * pdraw)
|
||||
{
|
||||
__GLXscreenConfigs *psc = pdraw->psc;
|
||||
|
||||
(*psc->core->destroyDrawable)(pdraw->driDrawable);
|
||||
(*psc->core->destroyDrawable) (pdraw->driDrawable);
|
||||
XF86DRIDestroyDrawable(psc->dpy, psc->scr, pdraw->drawable);
|
||||
Xfree(pdraw);
|
||||
}
|
||||
|
||||
static __GLXDRIdrawable *driCreateDrawable(__GLXscreenConfigs *psc,
|
||||
static __GLXDRIdrawable *
|
||||
driCreateDrawable(__GLXscreenConfigs * psc,
|
||||
XID xDrawable,
|
||||
GLXDrawable drawable,
|
||||
const __GLcontextModes *modes)
|
||||
GLXDrawable drawable, const __GLcontextModes * modes)
|
||||
{
|
||||
__GLXDRIdrawable *pdraw;
|
||||
drm_drawable_t hwDrawable;
|
||||
|
@ -552,12 +560,11 @@ static __GLXDRIdrawable *driCreateDrawable(__GLXscreenConfigs *psc,
|
|||
|
||||
/* Create a new drawable */
|
||||
pdraw->driDrawable =
|
||||
(*psc->legacy->createNewDrawable)(psc->__driScreen,
|
||||
(*psc->legacy->createNewDrawable) (psc->__driScreen,
|
||||
config->driConfig,
|
||||
hwDrawable,
|
||||
GLX_WINDOW_BIT,
|
||||
empty_attribute_list,
|
||||
pdraw);
|
||||
empty_attribute_list, pdraw);
|
||||
|
||||
if (!pdraw->driDrawable) {
|
||||
XF86DRIDestroyDrawable(psc->dpy, psc->scr, drawable);
|
||||
|
@ -570,23 +577,26 @@ static __GLXDRIdrawable *driCreateDrawable(__GLXscreenConfigs *psc,
|
|||
return pdraw;
|
||||
}
|
||||
|
||||
static void driSwapBuffers(__GLXDRIdrawable *pdraw)
|
||||
static void
|
||||
driSwapBuffers(__GLXDRIdrawable * pdraw)
|
||||
{
|
||||
(*pdraw->psc->core->swapBuffers)(pdraw->driDrawable);
|
||||
(*pdraw->psc->core->swapBuffers) (pdraw->driDrawable);
|
||||
}
|
||||
|
||||
static void driDestroyScreen(__GLXscreenConfigs *psc)
|
||||
static void
|
||||
driDestroyScreen(__GLXscreenConfigs * psc)
|
||||
{
|
||||
/* Free the direct rendering per screen data */
|
||||
if (psc->__driScreen)
|
||||
(*psc->core->destroyScreen)(psc->__driScreen);
|
||||
(*psc->core->destroyScreen) (psc->__driScreen);
|
||||
psc->__driScreen = NULL;
|
||||
if (psc->driver)
|
||||
dlclose(psc->driver);
|
||||
}
|
||||
|
||||
static __GLXDRIscreen *driCreateScreen(__GLXscreenConfigs *psc, int screen,
|
||||
__GLXdisplayPrivate *priv)
|
||||
static __GLXDRIscreen *
|
||||
driCreateScreen(__GLXscreenConfigs * psc, int screen,
|
||||
__GLXdisplayPrivate * priv)
|
||||
{
|
||||
__GLXDRIdisplayPrivate *pdp;
|
||||
__GLXDRIscreen *psp;
|
||||
|
@ -633,8 +643,7 @@ static __GLXDRIscreen *driCreateScreen(__GLXscreenConfigs *psc, int screen,
|
|||
}
|
||||
|
||||
pdp = (__GLXDRIdisplayPrivate *) priv->driDisplay;
|
||||
psc->__driScreen =
|
||||
CallCreateNewScreen(psc->dpy, screen, psc, pdp);
|
||||
psc->__driScreen = CallCreateNewScreen(psc->dpy, screen, psc, pdp);
|
||||
if (psc->__driScreen == NULL) {
|
||||
dlclose(psc->driver);
|
||||
Xfree(psp);
|
||||
|
@ -653,7 +662,8 @@ static __GLXDRIscreen *driCreateScreen(__GLXscreenConfigs *psc, int screen,
|
|||
|
||||
/* Called from __glXFreeDisplayPrivate.
|
||||
*/
|
||||
static void driDestroyDisplay(__GLXDRIdisplay *dpy)
|
||||
static void
|
||||
driDestroyDisplay(__GLXDRIdisplay * dpy)
|
||||
{
|
||||
Xfree(dpy);
|
||||
}
|
||||
|
@ -663,7 +673,8 @@ static void driDestroyDisplay(__GLXDRIdisplay *dpy)
|
|||
* This is called from __glXInitialize() when we are given a new
|
||||
* display pointer.
|
||||
*/
|
||||
_X_HIDDEN __GLXDRIdisplay *driCreateDisplay(Display *dpy)
|
||||
_X_HIDDEN __GLXDRIdisplay *
|
||||
driCreateDisplay(Display * dpy)
|
||||
{
|
||||
__GLXDRIdisplayPrivate *pdpyp;
|
||||
int eventBase, errorBase;
|
||||
|
|
Loading…
Reference in New Issue