From a54b92162e05a59aafd2868351b4b105ca6420e1 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz <jakob@collabora.com> Date: Mon, 9 Mar 2020 14:38:53 +0000 Subject: [PATCH] comp: Fix accidental code change from commit 9b662596 Spotted by @mpiatka. --- src/xrt/compositor/main/comp_distortion.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/xrt/compositor/main/comp_distortion.c b/src/xrt/compositor/main/comp_distortion.c index daa3dac43..7784faaac 100644 --- a/src/xrt/compositor/main/comp_distortion.c +++ b/src/xrt/compositor/main/comp_distortion.c @@ -769,12 +769,12 @@ comp_distortion_update_uniform_buffer_warp(struct comp_distortion *d, d->ubo_pano.aberr[1] = c->xdev->hmd->distortion.pano.aberration_k[1]; d->ubo_pano.aberr[2] = c->xdev->hmd->distortion.pano.aberration_k[2]; d->ubo_pano.aberr[3] = c->xdev->hmd->distortion.pano.aberration_k[3]; - d->ubo_pano.lens_center[0][0] = 0.5;//c->xdev->hmd->views[0].lens_center.x_meters; - d->ubo_pano.lens_center[0][1] = 0.5;//c->xdev->hmd->views[0].lens_center.y_meters; - d->ubo_pano.lens_center[1][0] = 0.5;//c->xdev->hmd->views[1].lens_center.x_meters; - d->ubo_pano.lens_center[1][1] = 0.5;//c->xdev->hmd->views[1].lens_center.y_meters; - d->ubo_pano.viewport_scale[0] = 1.0;//c->xdev->hmd->views[0].display.w_meters; - d->ubo_pano.viewport_scale[1] = 1.0;//c->xdev->hmd->views[0].display.h_meters; + d->ubo_pano.lens_center[0][0] = c->xdev->hmd->views[0].lens_center.x_meters; + d->ubo_pano.lens_center[0][1] = c->xdev->hmd->views[0].lens_center.y_meters; + d->ubo_pano.lens_center[1][0] = c->xdev->hmd->views[1].lens_center.x_meters; + d->ubo_pano.lens_center[1][1] = c->xdev->hmd->views[1].lens_center.y_meters; + d->ubo_pano.viewport_scale[0] = c->xdev->hmd->views[0].display.w_meters; + d->ubo_pano.viewport_scale[1] = c->xdev->hmd->views[0].display.h_meters; d->ubo_pano.warp_scale = c->xdev->hmd->distortion.pano.warp_scale; memcpy(d->ubo_handle.mapped, &d->ubo_pano, sizeof(d->ubo_pano));