diff --git a/src/xrt/compositor/main/comp_compositor.c b/src/xrt/compositor/main/comp_compositor.c index cea4edb54..6ae485d9f 100644 --- a/src/xrt/compositor/main/comp_compositor.c +++ b/src/xrt/compositor/main/comp_compositor.c @@ -956,7 +956,6 @@ xrt_gfx_provider_create_native(struct xrt_device *xdev) // Init the settings to default. comp_settings_init(&c->settings, xdev); - c->settings.flip_y = false; c->last_frame_time_ns = os_monotonic_get_ns(); c->frame_overhead_ns = 2000000; //! @todo set this to an estimate that's better than 6ms diff --git a/src/xrt/compositor/main/comp_distortion.c b/src/xrt/compositor/main/comp_distortion.c index 1132dc2aa..09558c302 100644 --- a/src/xrt/compositor/main/comp_distortion.c +++ b/src/xrt/compositor/main/comp_distortion.c @@ -180,8 +180,7 @@ comp_distortion_init(struct comp_distortion *d, VkPipelineCache pipeline_cache, enum xrt_distortion_model distortion_model, struct xrt_hmd_parts *parts, - VkDescriptorPool descriptor_pool, - bool flip_y) + VkDescriptorPool descriptor_pool) { d->vk = &c->vk; @@ -207,8 +206,8 @@ comp_distortion_init(struct comp_distortion *d, d->mesh.offset_indices[0] = parts->distortion.mesh.offset_indices[0]; d->mesh.offset_indices[1] = parts->distortion.mesh.offset_indices[1]; - d->ubo_vp_data[0].flip_y = flip_y; - d->ubo_vp_data[1].flip_y = flip_y; + d->ubo_vp_data[0].flip_y = false; + d->ubo_vp_data[1].flip_y = false; d->quirk_draw_lines = c->settings.debug.wireframe; comp_distortion_init_buffers(d, c); diff --git a/src/xrt/compositor/main/comp_distortion.h b/src/xrt/compositor/main/comp_distortion.h index bae6bd758..ef0ea4b22 100644 --- a/src/xrt/compositor/main/comp_distortion.h +++ b/src/xrt/compositor/main/comp_distortion.h @@ -125,8 +125,7 @@ comp_distortion_init(struct comp_distortion *d, VkPipelineCache pipeline_cache, enum xrt_distortion_model distortion_model, struct xrt_hmd_parts *parts, - VkDescriptorPool descriptor_pool, - bool flip_y); + VkDescriptorPool descriptor_pool); /*! * Free and destroy all fields, does not free the destortion itself. diff --git a/src/xrt/compositor/main/comp_renderer.c b/src/xrt/compositor/main/comp_renderer.c index bbdd3874b..983ced1ef 100644 --- a/src/xrt/compositor/main/comp_renderer.c +++ b/src/xrt/compositor/main/comp_renderer.c @@ -453,8 +453,7 @@ renderer_init(struct comp_renderer *r) comp_distortion_init(r->distortion, r->c, r->render_pass, r->pipeline_cache, r->settings->distortion_model, - r->c->xdev->hmd, r->descriptor_pool, - r->settings->flip_y); + r->c->xdev->hmd, r->descriptor_pool); VkExtent2D extent = { .width = r->c->xdev->hmd->screens[0].w_pixels, diff --git a/src/xrt/compositor/main/comp_settings.c b/src/xrt/compositor/main/comp_settings.c index 891738c6c..5b316ea78 100644 --- a/src/xrt/compositor/main/comp_settings.c +++ b/src/xrt/compositor/main/comp_settings.c @@ -38,7 +38,6 @@ comp_settings_init(struct comp_settings *s, struct xrt_device *xdev) s->present_mode = VK_PRESENT_MODE_FIFO_KHR; s->window_type = WINDOW_AUTO; s->fullscreen = false; - s->flip_y = false; s->distortion_model = xdev->hmd->distortion.preferred; s->width = xdev->hmd->screens[0].w_pixels; s->height = xdev->hmd->screens[0].h_pixels; diff --git a/src/xrt/compositor/main/comp_settings.h b/src/xrt/compositor/main/comp_settings.h index c396e82d4..d55688595 100644 --- a/src/xrt/compositor/main/comp_settings.h +++ b/src/xrt/compositor/main/comp_settings.h @@ -88,9 +88,6 @@ struct comp_settings //! Print information about available modes for direct mode. bool print_modes; - //! Should we flip y axis for compositor buffers (for GL) - bool flip_y; - //! Nominal frame interval uint64_t nominal_frame_interval_ns;