mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-29 09:58:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/main: Remove internal compositor global flip_y

Browse source
This commit is contained in:
Jakob Bornecrantz 2020-08-06 13:55:40 +01:00 committed by Jakob Bornecrantz
parent 0b8d800dcc
commit ee48b44087
6 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/xrt/compositor/main/comp_compositor.c
View file

@ -956,7 +956,6 @@ xrt_gfx_provider_create_native(struct xrt_device *xdev)
// Init the settings to default. // Init the settings to default.
comp_settings_init(&c->settings, xdev); comp_settings_init(&c->settings, xdev);
c->settings.flip_y = false;
c->last_frame_time_ns = os_monotonic_get_ns(); c->last_frame_time_ns = os_monotonic_get_ns();
c->frame_overhead_ns = 2000000; c->frame_overhead_ns = 2000000;
//! @todo set this to an estimate that's better than 6ms //! @todo set this to an estimate that's better than 6ms

7
src/xrt/compositor/main/comp_distortion.c
View file

@ -180,8 +180,7 @@ comp_distortion_init(struct comp_distortion *d,
VkPipelineCache pipeline_cache, VkPipelineCache pipeline_cache,
enum xrt_distortion_model distortion_model, enum xrt_distortion_model distortion_model,
struct xrt_hmd_parts *parts, struct xrt_hmd_parts *parts,
VkDescriptorPool descriptor_pool, VkDescriptorPool descriptor_pool)
bool flip_y)
{ {
d->vk = &c->vk; 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[0] = parts->distortion.mesh.offset_indices[0];
d->mesh.offset_indices[1] = parts->distortion.mesh.offset_indices[1]; d->mesh.offset_indices[1] = parts->distortion.mesh.offset_indices[1];
d->ubo_vp_data[0].flip_y = flip_y; d->ubo_vp_data[0].flip_y = false;
d->ubo_vp_data[1].flip_y = flip_y; d->ubo_vp_data[1].flip_y = false;
d->quirk_draw_lines = c->settings.debug.wireframe; d->quirk_draw_lines = c->settings.debug.wireframe;
comp_distortion_init_buffers(d, c); comp_distortion_init_buffers(d, c);

3
src/xrt/compositor/main/comp_distortion.h
View file

@ -125,8 +125,7 @@ comp_distortion_init(struct comp_distortion *d,
VkPipelineCache pipeline_cache, VkPipelineCache pipeline_cache,
enum xrt_distortion_model distortion_model, enum xrt_distortion_model distortion_model,
struct xrt_hmd_parts *parts, struct xrt_hmd_parts *parts,
VkDescriptorPool descriptor_pool, VkDescriptorPool descriptor_pool);
bool flip_y);
/*! /*!
* Free and destroy all fields, does not free the destortion itself. * Free and destroy all fields, does not free the destortion itself.

3
src/xrt/compositor/main/comp_renderer.c
View file

@ -453,8 +453,7 @@ renderer_init(struct comp_renderer *r)
comp_distortion_init(r->distortion, r->c, r->render_pass, comp_distortion_init(r->distortion, r->c, r->render_pass,
r->pipeline_cache, r->settings->distortion_model, r->pipeline_cache, r->settings->distortion_model,
r->c->xdev->hmd, r->descriptor_pool, r->c->xdev->hmd, r->descriptor_pool);
r->settings->flip_y);
VkExtent2D extent = { VkExtent2D extent = {
.width = r->c->xdev->hmd->screens[0].w_pixels, .width = r->c->xdev->hmd->screens[0].w_pixels,

1
src/xrt/compositor/main/comp_settings.c
View file

@ -38,7 +38,6 @@ comp_settings_init(struct comp_settings *s, struct xrt_device *xdev)
s->present_mode = VK_PRESENT_MODE_FIFO_KHR; s->present_mode = VK_PRESENT_MODE_FIFO_KHR;
s->window_type = WINDOW_AUTO; s->window_type = WINDOW_AUTO;
s->fullscreen = false; s->fullscreen = false;
s->flip_y = false;
s->distortion_model = xdev->hmd->distortion.preferred; s->distortion_model = xdev->hmd->distortion.preferred;
s->width = xdev->hmd->screens[0].w_pixels; s->width = xdev->hmd->screens[0].w_pixels;
s->height = xdev->hmd->screens[0].h_pixels; s->height = xdev->hmd->screens[0].h_pixels;

3
src/xrt/compositor/main/comp_settings.h
View file

@ -88,9 +88,6 @@ struct comp_settings
//! Print information about available modes for direct mode. //! Print information about available modes for direct mode.
bool print_modes; bool print_modes;
//! Should we flip y axis for compositor buffers (for GL)
bool flip_y;
//! Nominal frame interval //! Nominal frame interval
uint64_t nominal_frame_interval_ns; uint64_t nominal_frame_interval_ns;