diff options
| author | Adam Jackson <ajax@redhat.com> | 2021-05-03 08:38:02 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2021-05-03 15:00:41 -0400 |
| commit | f5d6a1b916fb163ee72e6a6f356937b1fbac53e0 (patch) | |
| tree | fd6a7cc495f0acb59f381d802c69998e88d93f27 /src/glx/glxclient.h | |
| parent | ea72be8b7c8566c008d81441843ecfb527f39b72 (diff) | |
Revert "glx: s/Display */struct glx_display */ over internal API"
This broke texture-from-pixmap in OBS Studio so I must have done
something wrong and also we need better tfp testing.
This reverts commit b02b26b87cd124b05a409b680817ee1950d6d94a.
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4718
Acked-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10593>
Diffstat (limited to 'src/glx/glxclient.h')
| -rw-r--r-- | src/glx/glxclient.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h index e544f02c324..e335571b918 100644 --- a/src/glx/glxclient.h +++ b/src/glx/glxclient.h @@ -620,7 +620,7 @@ glx_screen_cleanup(struct glx_screen *psc); #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) extern __GLXDRIdrawable * -dri2GetGlxDrawableFromXDrawableId(struct glx_display *priv, XID id); +dri2GetGlxDrawableFromXDrawableId(Display *dpy, XID id); #endif extern GLubyte *__glXFlushRenderBuffer(struct glx_context *, GLubyte *); @@ -771,7 +771,7 @@ extern void GarbageCollectDRIDrawables(struct glx_screen *psc); extern __GLXDRIdrawable * -GetGLXDRIDrawable(struct glx_display *priv, GLXDrawable drawable); +GetGLXDRIDrawable(Display *dpy, GLXDrawable drawable); #endif extern struct glx_screen *GetGLXScreenConfigs(Display * dpy, int scrn); @@ -796,10 +796,10 @@ extern Bool validate_renderType_against_config(const struct glx_config *config, int renderType); -extern struct glx_drawable *GetGLXDrawable(struct glx_display *priv, GLXDrawable drawable); -extern int InitGLXDrawable(struct glx_display *priv, struct glx_drawable *glxDraw, +extern struct glx_drawable *GetGLXDrawable(Display *dpy, GLXDrawable drawable); +extern int InitGLXDrawable(Display *dpy, struct glx_drawable *glxDraw, XID xDrawable, GLXDrawable drawable); -extern void DestroyGLXDrawable(struct glx_display *priv, GLXDrawable drawable); +extern void DestroyGLXDrawable(Display *dpy, GLXDrawable drawable); extern struct glx_context dummyContext; @@ -818,9 +818,8 @@ indirect_create_context_attribs(struct glx_screen *base, unsigned *error); -extern int -__glXGetDrawableAttribute(struct glx_display *priv, GLXDrawable drawable, - int attribute, unsigned int *value); +extern int __glXGetDrawableAttribute(Display * dpy, GLXDrawable drawable, + int attribute, unsigned int *value); #ifdef __cplusplus } |