projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
egl: drop unused _EGLDriver from CopyBuffers()
[mesa.git]
/
src
/
egl
/
drivers
/
dri2
/
platform_x11.c
diff --git
a/src/egl/drivers/dri2/platform_x11.c
b/src/egl/drivers/dri2/platform_x11.c
index 2c0ab609401dd3339064d96dfca9aa7319e2bee6..c463386481653ceeef307fa0fad01aae76437079 100644
(file)
--- a/
src/egl/drivers/dri2/platform_x11.c
+++ b/
src/egl/drivers/dri2/platform_x11.c
@@
-52,8
+52,7
@@
#endif
static EGLBoolean
#endif
static EGLBoolean
-dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
- EGLint interval);
+dri2_x11_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval);
uint32_t
dri2_format_for_depth(struct dri2_egl_display *dri2_dpy, uint32_t depth);
uint32_t
dri2_format_for_depth(struct dri2_egl_display *dri2_dpy, uint32_t depth);
@@
-375,7
+374,7
@@
dri2_x11_create_window_surface(_EGLDisplay *disp, _EGLConfig *conf,
surf->SwapInterval = 1;
/* Override that with a driconf-set value. */
surf->SwapInterval = 1;
/* Override that with a driconf-set value. */
- dri2_x11_swap_interval(disp
->Driver, disp
, surf, dri2_dpy->default_swap_interval);
+ dri2_x11_swap_interval(disp, surf, dri2_dpy->default_swap_interval);
}
return surf;
}
return surf;
@@
-430,9
+429,8
@@
dri2_x11_destroy_surface(_EGLDisplay *disp, _EGLSurface *surf)
* have.
*/
static EGLBoolean
* have.
*/
static EGLBoolean
-dri2_query_surface(const _EGLDriver *drv, _EGLDisplay *disp,
- _EGLSurface *surf, EGLint attribute,
- EGLint *value)
+dri2_query_surface(_EGLDisplay *disp, _EGLSurface *surf,
+ EGLint attribute, EGLint *value)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
@@
-451,7
+449,7
@@
dri2_query_surface(const _EGLDriver *drv, _EGLDisplay *disp,
default:
break;
}
default:
break;
}
- return _eglQuerySurface(d
rv, d
isp, surf, attribute, value);
+ return _eglQuerySurface(disp, surf, attribute, value);
}
/**
}
/**
@@
-844,7
+842,7
@@
dri2_x11_add_configs_for_visuals(struct dri2_egl_display *dri2_dpy,
}
static EGLBoolean
}
static EGLBoolean
-dri2_copy_region(
const _EGLDriver *drv,
_EGLDisplay *disp,
+dri2_copy_region(_EGLDisplay *disp,
_EGLSurface *draw, xcb_xfixes_region_t region)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
_EGLSurface *draw, xcb_xfixes_region_t region)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
@@
-874,7
+872,7
@@
dri2_copy_region(const _EGLDriver *drv, _EGLDisplay *disp,
}
static int64_t
}
static int64_t
-dri2_x11_swap_buffers_msc(
const _EGLDriver *drv,
_EGLDisplay *disp, _EGLSurface *draw,
+dri2_x11_swap_buffers_msc(_EGLDisplay *disp, _EGLSurface *draw,
int64_t msc, int64_t divisor, int64_t remainder)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
int64_t msc, int64_t divisor, int64_t remainder)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
@@
-890,7
+888,7
@@
dri2_x11_swap_buffers_msc(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface
int64_t swap_count = -1;
if (draw->SwapBehavior == EGL_BUFFER_PRESERVED || !dri2_dpy->swap_available) {
int64_t swap_count = -1;
if (draw->SwapBehavior == EGL_BUFFER_PRESERVED || !dri2_dpy->swap_available) {
- swap_count = dri2_copy_region(d
rv, d
isp, draw, dri2_surf->region) ? 0 : -1;
+ swap_count = dri2_copy_region(disp, draw, dri2_surf->region) ? 0 : -1;
} else {
dri2_flush_drawable_for_swapbuffers(disp, draw);
} else {
dri2_flush_drawable_for_swapbuffers(disp, draw);
@@
-924,7
+922,7
@@
dri2_x11_swap_buffers_msc(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface
}
static EGLBoolean
}
static EGLBoolean
-dri2_x11_swap_buffers(
const _EGLDriver *drv,
_EGLDisplay *disp, _EGLSurface *draw)
+dri2_x11_swap_buffers(_EGLDisplay *disp, _EGLSurface *draw)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(draw);
@@
-934,7
+932,7
@@
dri2_x11_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dra
return EGL_TRUE;
}
return EGL_TRUE;
}
- if (dri2_x11_swap_buffers_msc(d
rv, d
isp, draw, 0, 0, 0) == -1) {
+ if (dri2_x11_swap_buffers_msc(disp, draw, 0, 0, 0) == -1) {
/* Swap failed with a window drawable. */
return _eglError(EGL_BAD_NATIVE_WINDOW, __func__);
}
/* Swap failed with a window drawable. */
return _eglError(EGL_BAD_NATIVE_WINDOW, __func__);
}
@@
-942,8
+940,7
@@
dri2_x11_swap_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dra
}
static EGLBoolean
}
static EGLBoolean
-dri2_x11_swap_buffers_region(const _EGLDriver *drv, _EGLDisplay *disp,
- _EGLSurface *draw,
+dri2_x11_swap_buffers_region(_EGLDisplay *disp, _EGLSurface *draw,
EGLint numRects, const EGLint *rects)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
EGLint numRects, const EGLint *rects)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
@@
-953,7
+950,7
@@
dri2_x11_swap_buffers_region(const _EGLDriver *drv, _EGLDisplay *disp,
xcb_rectangle_t rectangles[16];
if (numRects > (int)ARRAY_SIZE(rectangles))
xcb_rectangle_t rectangles[16];
if (numRects > (int)ARRAY_SIZE(rectangles))
- return dri2_copy_region(d
rv, d
isp, draw, dri2_surf->region);
+ return dri2_copy_region(disp, draw, dri2_surf->region);
for (int i = 0; i < numRects; i++) {
rectangles[i].x = rects[i * 4];
for (int i = 0; i < numRects; i++) {
rectangles[i].x = rects[i * 4];
@@
-964,7
+961,7
@@
dri2_x11_swap_buffers_region(const _EGLDriver *drv, _EGLDisplay *disp,
region = xcb_generate_id(dri2_dpy->conn);
xcb_xfixes_create_region(dri2_dpy->conn, region, numRects, rectangles);
region = xcb_generate_id(dri2_dpy->conn);
xcb_xfixes_create_region(dri2_dpy->conn, region, numRects, rectangles);
- ret = dri2_copy_region(d
rv, d
isp, draw, region);
+ ret = dri2_copy_region(disp, draw, region);
xcb_xfixes_destroy_region(dri2_dpy->conn, region);
return ret;
xcb_xfixes_destroy_region(dri2_dpy->conn, region);
return ret;
@@
-979,12
+976,11
@@
dri2_x11_post_sub_buffer(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *
if (x < 0 || y < 0 || width < 0 || height < 0)
_eglError(EGL_BAD_PARAMETER, "eglPostSubBufferNV");
if (x < 0 || y < 0 || width < 0 || height < 0)
_eglError(EGL_BAD_PARAMETER, "eglPostSubBufferNV");
- return dri2_x11_swap_buffers_region(d
rv, d
isp, draw, 1, rect);
+ return dri2_x11_swap_buffers_region(disp, draw, 1, rect);
}
static EGLBoolean
}
static EGLBoolean
-dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
- EGLint interval)
+dri2_x11_swap_interval(_EGLDisplay *disp, _EGLSurface *surf, EGLint interval)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
@@
-996,8
+992,7
@@
dri2_x11_swap_interval(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *su
}
static EGLBoolean
}
static EGLBoolean
-dri2_x11_copy_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
- void *native_pixmap_target)
+dri2_x11_copy_buffers(_EGLDisplay *disp, _EGLSurface *surf, void *native_pixmap_target)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
@@
-1007,8
+1002,6
@@
dri2_x11_copy_buffers(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *sur
STATIC_ASSERT(sizeof(uintptr_t) == sizeof(native_pixmap_target));
target = (uintptr_t) native_pixmap_target;
STATIC_ASSERT(sizeof(uintptr_t) == sizeof(native_pixmap_target));
target = (uintptr_t) native_pixmap_target;
- (void) drv;
-
dri2_dpy->flush->flush(dri2_surf->dri_drawable);
gc = xcb_generate_id(dri2_dpy->conn);
dri2_dpy->flush->flush(dri2_surf->dri_drawable);
gc = xcb_generate_id(dri2_dpy->conn);