diff options
author | Anuj Phogat <anuj.phogat@gmail.com> | 2021-04-12 20:17:16 -0700 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2021-04-20 20:06:33 +0000 |
commit | 4c535cbf99fda308aa54ab64d228c9c96ba5650a (patch) | |
tree | 5f0e88e4ab26aa70b150512f6e6c2e2efe188eab /src/mesa/drivers | |
parent | 61e8636557f7459f4adeb230016362b63ab1ce7f (diff) |
intel: Fix alignment and line wrapping due to gen_device renaming
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10241>
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_bufmgr.h | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_performance_query.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_tex_image.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h index 55bde375799..472a8b19065 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.h +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h @@ -351,8 +351,8 @@ int brw_bo_busy(struct brw_bo *bo); int brw_bo_madvise(struct brw_bo *bo, int madv); /* drm_bacon_bufmgr_gem.c */ -struct brw_bufmgr *brw_bufmgr_get_for_fd(struct intel_device_info *devinfo, int fd, - bool bo_reuse); +struct brw_bufmgr *brw_bufmgr_get_for_fd(struct intel_device_info *devinfo, + int fd, bool bo_reuse); struct brw_bo *brw_bo_gem_create_from_name(struct brw_bufmgr *bufmgr, const char *name, diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c index 7f5167a59e5..a1354c14d7a 100644 --- a/src/mesa/drivers/dri/i965/brw_performance_query.c +++ b/src/mesa/drivers/dri/i965/brw_performance_query.c @@ -372,8 +372,8 @@ brw_delete_perf_query(struct gl_context *ctx, } /******************************************************************************/ -/* intel_device_info will have incorrect default topology values for unsupported kernels. - * verify kernel support to ensure OA metrics are accurate. +/* intel_device_info will have incorrect default topology values for unsupported + * kernels. Verify kernel support to ensure OA metrics are accurate. */ static bool oa_metrics_kernel_support(int fd, const struct intel_device_info *devinfo) diff --git a/src/mesa/drivers/dri/i965/brw_tex_image.c b/src/mesa/drivers/dri/i965/brw_tex_image.c index ff5a800e0fa..02e9d6438d3 100644 --- a/src/mesa/drivers/dri/i965/brw_tex_image.c +++ b/src/mesa/drivers/dri/i965/brw_tex_image.c @@ -971,7 +971,9 @@ brw_compressedtexsubimage(struct gl_context *ctx, GLuint dims, !_mesa_is_srgb_format(gl_format); struct brw_context *brw = (struct brw_context*) ctx; const struct intel_device_info *devinfo = &brw->screen->devinfo; - if (devinfo->ver == 9 && !intel_device_info_is_9lp(devinfo) && is_linear_astc) + if (devinfo->ver == 9 && + !intel_device_info_is_9lp(devinfo) && + is_linear_astc) flush_astc_denorms(ctx, dims, texImage, xoffset, yoffset, zoffset, width, height, depth); |