Module: Mesa Branch: master Commit: b98c905a463a1915fd15861ad2d0af180ad605ac URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b98c905a463a1915fd15861ad2d0af180ad605ac
Author: Eric Engestrom <eric.engest...@imgtec.com> Date: Wed Feb 28 16:08:54 2018 +0000 gbm: give a name to rgba fields Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com> Reviewed-by: Daniel Stone <dani...@collabora.com> --- src/egl/drivers/dri2/platform_drm.c | 16 ++++++++-------- src/gbm/backends/dri/gbm_driint.h | 7 ++++++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/egl/drivers/dri2/platform_drm.c b/src/egl/drivers/dri2/platform_drm.c index 01fa1f11b9..dc4efea910 100644 --- a/src/egl/drivers/dri2/platform_drm.c +++ b/src/egl/drivers/dri2/platform_drm.c @@ -118,10 +118,10 @@ dri2_drm_config_is_compatible(struct dri2_egl_display *dri2_dpy, if (i == dri2_dpy->gbm_dri->num_visuals) return false; - if (red != visual->rgba_masks[0] || - green != visual->rgba_masks[1] || - blue != visual->rgba_masks[2] || - (alpha && visual->rgba_masks[3] && alpha != visual->rgba_masks[3])) { + if (red != visual->rgba_masks.red || + green != visual->rgba_masks.green || + blue != visual->rgba_masks.blue || + (alpha && visual->rgba_masks.alpha && alpha != visual->rgba_masks.alpha)) { return false; } @@ -638,10 +638,10 @@ drm_add_configs_for_visuals(_EGLDriver *drv, _EGLDisplay *disp) for (unsigned j = 0; j < num_visuals; j++) { struct dri2_egl_config *dri2_conf; - if (visuals[j].rgba_masks[0] != red || - visuals[j].rgba_masks[1] != green || - visuals[j].rgba_masks[2] != blue || - visuals[j].rgba_masks[3] != alpha) + if (visuals[j].rgba_masks.red != red || + visuals[j].rgba_masks.green != green || + visuals[j].rgba_masks.blue != blue || + visuals[j].rgba_masks.alpha != alpha) continue; const EGLint attr_list[] = { diff --git a/src/gbm/backends/dri/gbm_driint.h b/src/gbm/backends/dri/gbm_driint.h index 84a98533c7..8497be3e8f 100644 --- a/src/gbm/backends/dri/gbm_driint.h +++ b/src/gbm/backends/dri/gbm_driint.h @@ -43,7 +43,12 @@ struct gbm_dri_bo; struct gbm_dri_visual { uint32_t gbm_format; int dri_image_format; - uint32_t rgba_masks[4]; + struct { + uint32_t red; + uint32_t green; + uint32_t blue; + uint32_t alpha; + } rgba_masks; }; struct gbm_dri_device { _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit