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

winsys/virgl: remove temporary ret variable

Browse Source 
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Emil Velikov
2015-10-28 12:50:47 +00:00
parent bdcb005788
commit 7154d48c6e
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gallium/winsys/virgl/drm/virgl_drm_winsys.c
View File

@@ -236,7 +236,6 @@ virgl_bo_transfer_put(struct virgl_winsys *vws,
{ {
struct virgl_drm_winsys *vdws = virgl_drm_winsys(vws); struct virgl_drm_winsys *vdws = virgl_drm_winsys(vws);
struct drm_virtgpu_3d_transfer_to_host tohostcmd; struct drm_virtgpu_3d_transfer_to_host tohostcmd;
int ret;
memset(&tohostcmd, 0, sizeof(tohostcmd)); memset(&tohostcmd, 0, sizeof(tohostcmd));
tohostcmd.bo_handle = res->bo_handle; tohostcmd.bo_handle = res->bo_handle;
@@ -245,8 +244,7 @@ virgl_bo_transfer_put(struct virgl_winsys *vws,
tohostcmd.level = level; tohostcmd.level = level;
// tohostcmd.stride = stride; // tohostcmd.stride = stride;
// tohostcmd.layer_stride = stride; // tohostcmd.layer_stride = stride;
ret = drmIoctl(vdws->fd, DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST, &tohostcmd); return drmIoctl(vdws->fd, DRM_IOCTL_VIRTGPU_TRANSFER_TO_HOST, &tohostcmd);
return ret;
} }
static int static int
@@ -258,7 +256,6 @@ virgl_bo_transfer_get(struct virgl_winsys *vws,
{ {
struct virgl_drm_winsys *vdws = virgl_drm_winsys(vws); struct virgl_drm_winsys *vdws = virgl_drm_winsys(vws);
struct drm_virtgpu_3d_transfer_from_host fromhostcmd; struct drm_virtgpu_3d_transfer_from_host fromhostcmd;
int ret;
memset(&fromhostcmd, 0, sizeof(fromhostcmd)); memset(&fromhostcmd, 0, sizeof(fromhostcmd));
fromhostcmd.bo_handle = res->bo_handle; fromhostcmd.bo_handle = res->bo_handle;
@@ -267,8 +264,7 @@ virgl_bo_transfer_get(struct virgl_winsys *vws,
// fromhostcmd.stride = stride; // fromhostcmd.stride = stride;
// fromhostcmd.layer_stride = layer_stride; // fromhostcmd.layer_stride = layer_stride;
fromhostcmd.box = *(struct drm_virtgpu_3d_box *)box; fromhostcmd.box = *(struct drm_virtgpu_3d_box *)box;
ret = drmIoctl(vdws->fd, DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST, &fromhostcmd); return drmIoctl(vdws->fd, DRM_IOCTL_VIRTGPU_TRANSFER_FROM_HOST, &fromhostcmd);
return ret;
} }
static struct virgl_hw_res *virgl_drm_winsys_resource_cache_create(struct virgl_winsys *qws, static struct virgl_hw_res *virgl_drm_winsys_resource_cache_create(struct virgl_winsys *qws,
@@ -651,15 +647,13 @@ static int virgl_drm_get_caps(struct virgl_winsys *vws, struct virgl_drm_caps *c
{ {
struct virgl_drm_winsys *vdws = virgl_drm_winsys(vws); struct virgl_drm_winsys *vdws = virgl_drm_winsys(vws);
struct drm_virtgpu_get_caps args; struct drm_virtgpu_get_caps args;
int ret;
memset(&args, 0, sizeof(args)); memset(&args, 0, sizeof(args));
args.cap_set_id = 1; args.cap_set_id = 1;
args.addr = (unsigned long)&caps->caps; args.addr = (unsigned long)&caps->caps;
args.size = sizeof(union virgl_caps); args.size = sizeof(union virgl_caps);
ret = drmIoctl(vdws->fd, DRM_IOCTL_VIRTGPU_GET_CAPS, &args); return drmIoctl(vdws->fd, DRM_IOCTL_VIRTGPU_GET_CAPS, &args);
return ret;
} }
#define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x))) #define PTR_TO_UINT(x) ((unsigned)((intptr_t)(x)))