OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/dri2: refactor dri2_query_surface, swrastGetDrawableInfo

Browse Source 
Currently swrastGetDrawableInfo always initializes w and h, patch
refactors function as x11_get_drawable_info that returns success and
sets the values only if no error happened. Add swrastGetDrawableInfo
wrapper function as expected by DRI extension.

v2: init w,y,w,h in swrastGetDrawableInfo (Eric)

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reported-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Tapani Pälli
2017-08-08 10:52:26 +03:00
parent a1c9a6da18
commit b65a91e582
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/egl/drivers/dri2/platform_x11.c
View File

@@ -99,8 +99,8 @@ swrastDestroyDrawable(struct dri2_egl_display * dri2_dpy,
xcb_free_gc(dri2_dpy->conn, dri2_surf->swapgc); xcb_free_gc(dri2_dpy->conn, dri2_surf->swapgc);
} }
static void static bool
swrastGetDrawableInfo(__DRIdrawable * draw, x11_get_drawable_info(__DRIdrawable * draw,
int *x, int *y, int *w, int *h, int *x, int *y, int *w, int *h,
void *loaderPrivate) void *loaderPrivate)
{ {
@@ -110,14 +110,15 @@ swrastGetDrawableInfo(__DRIdrawable * draw,
xcb_get_geometry_cookie_t cookie; xcb_get_geometry_cookie_t cookie;
xcb_get_geometry_reply_t *reply; xcb_get_geometry_reply_t *reply;
xcb_generic_error_t *error; xcb_generic_error_t *error;
bool ret;
*x = *y = *w = *h = 0;
cookie = xcb_get_geometry (dri2_dpy->conn, dri2_surf->drawable); cookie = xcb_get_geometry (dri2_dpy->conn, dri2_surf->drawable);
reply = xcb_get_geometry_reply (dri2_dpy->conn, cookie, &error); reply = xcb_get_geometry_reply (dri2_dpy->conn, cookie, &error);
if (reply == NULL) if (reply == NULL)
return; return false;
if (error != NULL) { if (error != NULL) {
ret = false;
_eglLog(_EGL_WARNING, "error in xcb_get_geometry"); _eglLog(_EGL_WARNING, "error in xcb_get_geometry");
free(error); free(error);
} else { } else {
@@ -125,8 +126,19 @@ swrastGetDrawableInfo(__DRIdrawable * draw,
*y = reply->y; *y = reply->y;
*w = reply->width; *w = reply->width;
*h = reply->height; *h = reply->height;
ret = true;
} }
free(reply); free(reply);
return ret;
}
static void
swrastGetDrawableInfo(__DRIdrawable * draw,
int *x, int *y, int *w, int *h,
void *loaderPrivate)
{
*x = *y = *w = *h = 0;
x11_get_drawable_info(draw, x, y, w, h, loaderPrivate);
} }
static void static void
@@ -412,15 +424,14 @@ dri2_query_surface(_EGLDriver *drv, _EGLDisplay *dpy,
{ {
struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy); struct dri2_egl_display *dri2_dpy = dri2_egl_display(dpy);
struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf); struct dri2_egl_surface *dri2_surf = dri2_egl_surface(surf);
int x, y, w = -1, h = -1; int x, y, w, h;
__DRIdrawable *drawable = dri2_dpy->vtbl->get_dri_drawable(surf); __DRIdrawable *drawable = dri2_dpy->vtbl->get_dri_drawable(surf);
switch (attribute) { switch (attribute) {
case EGL_WIDTH: case EGL_WIDTH:
case EGL_HEIGHT: case EGL_HEIGHT:
swrastGetDrawableInfo(drawable, &x, &y, &w, &h, dri2_surf); if (x11_get_drawable_info(drawable, &x, &y, &w, &h, dri2_surf)) {
if (w != -1 && h != -1) {
surf->Width = w; surf->Width = w;
surf->Height = h; surf->Height = h;
} }