fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 12:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glx: Eliminate some stub functions for !GLX_DIRECT_RENDERING

Browse source 
Move the ifdefs into the corresponding (real) function bodies. No
functional change, just making this file's style consistent.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7660>
This commit is contained in:
Adam Jackson 2020-09-16 11:21:10 -04:00 • committed by Marge Bot
parent 893a30eacc
commit 97ae429754
1 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/glx/glx_pbuffer.c
View file

@ -188,12 +188,14 @@ determineTextureFormat(const int *attribs, int numAttribs)
return 0;
}
#endif
static GLboolean
CreateDRIDrawable(Display *dpy, struct glx_config *config,
XID drawable, XID glxdrawable,
const int *attrib_list, size_t num_attribs)
{
#ifdef GLX_DIRECT_RENDERING
struct glx_display *const priv = __glXInitialize(dpy);
__GLXDRIdrawable *pdraw;
struct glx_screen *psc;
@ -221,6 +223,7 @@ CreateDRIDrawable(Display *dpy, struct glx_config *config,
pdraw->textureTarget = determineTextureTarget(attrib_list, num_attribs);
pdraw->textureFormat = determineTextureFormat(attrib_list, num_attribs);
#endif
return GL_TRUE;
}
@ -228,6 +231,7 @@ CreateDRIDrawable(Display *dpy, struct glx_config *config,
static void
DestroyDRIDrawable(Display *dpy, GLXDrawable drawable, int destroy_xdrawable)
{
#ifdef GLX_DIRECT_RENDERING
struct glx_display *const priv = __glXInitialize(dpy);
__GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable);
XID xid;
@ -239,24 +243,8 @@ DestroyDRIDrawable(Display *dpy, GLXDrawable drawable, int destroy_xdrawable)
if (destroy_xdrawable)
XFreePixmap(priv->dpy, xid);
}
}
#else
static GLboolean
CreateDRIDrawable(Display *dpy, const struct glx_config * fbconfig,
XID drawable, XID glxdrawable,
const int *attrib_list, size_t num_attribs)
{
return GL_TRUE;
}
static void
DestroyDRIDrawable(Display *dpy, GLXDrawable drawable, int destroy_xdrawable)
{
}
#endif
}
/**
* Get a drawable's attribute.