gbm: Use unsigned for BO offset getter

The actual offset returned is uint32_t, however int64_t was used as the
return type from gbm_bo_get_offset to allow negative returns to signal
errors to the caller.

In case of an error getting the offset, the user will also be unable to
get the handle/FD, and thus have nothing to offset into. This means that
returning 0 as an error value is harmless, allowing us to change the
return type to uint32_t in order to avoid signed/unsigned confusion in
callers.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Daniel Stone 2017-03-23 15:09:49 +00:00
parent ec0313fd58
commit 378025ca8b
4 changed files with 13 additions and 12 deletions

View File

@ -710,22 +710,23 @@ gbm_dri_bo_get_stride(struct gbm_bo *_bo, int plane)
return (uint32_t)stride;
}
static int64_t
static uint32_t
gbm_dri_bo_get_offset(struct gbm_bo *_bo, int plane)
{
struct gbm_dri_device *dri = gbm_dri_device(_bo->gbm);
struct gbm_dri_bo *bo = gbm_dri_bo(_bo);
int offset = 0;
if (!dri->image || dri->image->base.version < 13 || !dri->image->fromPlanar) {
errno = ENOSYS;
return -1;
}
/* These error cases do not actually return an error code, as the user
* will also fail to obtain the handle/FD from the BO. In that case, the
* offset is irrelevant, as they have no buffer to offset into, so
* returning 0 is harmless.
*/
if (!dri->image || dri->image->base.version < 13 || !dri->image->fromPlanar)
return 0;
if (plane >= get_number_planes(dri, bo->image)) {
errno = EINVAL;
return -2;
}
if (plane >= get_number_planes(dri, bo->image))
return 0;
/* Dumb images have no offset */
if (bo->image == NULL) {

View File

@ -203,7 +203,7 @@ gbm_bo_get_format(struct gbm_bo *bo)
* \param bo The buffer object
* \return The offset
*/
GBM_EXPORT int64_t
GBM_EXPORT uint32_t
gbm_bo_get_offset(struct gbm_bo *bo, int plane)
{
return bo->gbm->bo_get_offset(bo, plane);

View File

@ -315,7 +315,7 @@ gbm_bo_get_stride_for_plane(struct gbm_bo *bo, int plane);
uint32_t
gbm_bo_get_format(struct gbm_bo *bo);
int64_t
uint32_t
gbm_bo_get_offset(struct gbm_bo *bo, int plane);
struct gbm_device *

View File

@ -81,7 +81,7 @@ struct gbm_device {
int (*bo_get_planes)(struct gbm_bo *bo);
union gbm_bo_handle (*bo_get_handle)(struct gbm_bo *bo, int plane);
uint32_t (*bo_get_stride)(struct gbm_bo *bo, int plane);
int64_t (*bo_get_offset)(struct gbm_bo *bo, int plane);
uint32_t (*bo_get_offset)(struct gbm_bo *bo, int plane);
uint64_t (*bo_get_modifier)(struct gbm_bo *bo);
void (*bo_destroy)(struct gbm_bo *bo);