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

c/main: Follow OpenXR spec with blackground colour, tweek no layer colour.

Browse source 
Make background colour completely black if there are layers to display, to
follow OpenXR spec. Make the default background colour darker.
This commit is contained in:
Moses Turner 2021-02-21 00:35:10 -06:00 committed by Jakob Bornecrantz
parent 2b962a5bfb
commit b62b6eaef7
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/xrt/compositor/main/comp_layer_renderer.c
View file

@ -22,10 +22,16 @@ struct comp_layer_vertex
float uv[2];
};
static const VkClearColorValue background_color = {
.float32 = {0.3f, 0.3f, 0.3f, 1.0f},
static const VkClearColorValue background_color_idle = {
.float32 = {0.1f, 0.1f, 0.1f, 1.0f},
};
static const VkClearColorValue background_color_active = {
.float32 = {0.0f, 0.0f, 0.0f, 1.0f},
};
static bool
_init_render_pass(struct vk_bundle *vk,
VkFormat format,
@ -571,7 +577,10 @@ _render_pass_begin(struct vk_bundle *vk,
}
static void
_render_stereo(struct comp_layer_renderer *self, struct vk_bundle *vk, VkCommandBuffer cmd_buffer)
_render_stereo(struct comp_layer_renderer *self,
struct vk_bundle *vk,
VkCommandBuffer cmd_buffer,
const VkClearColorValue *color)
{
COMP_TRACE_MARKER();
@ -586,8 +595,8 @@ _render_stereo(struct comp_layer_renderer *self, struct vk_bundle *vk, VkCommand
vk->vkCmdSetScissor(cmd_buffer, 0, 1, &scissor);
for (uint32_t eye = 0; eye < 2; eye++) {
_render_pass_begin(vk, self->render_pass, self->extent, background_color,
self->framebuffers[eye].handle, cmd_buffer);
_render_pass_begin(vk, self->render_pass, self->extent, *color, self->framebuffers[eye].handle,
cmd_buffer);
_render_eye(self, eye, cmd_buffer, self->pipeline_layout);
@ -605,9 +614,12 @@ comp_layer_renderer_draw(struct comp_layer_renderer *self)
VkCommandBuffer cmd_buffer;
if (vk_init_cmd_buffer(vk, &cmd_buffer) != VK_SUCCESS)
return;
os_mutex_lock(&vk->cmd_pool_mutex);
_render_stereo(self, vk, cmd_buffer);
if (self->num_layers == 0) {
_render_stereo(self, vk, cmd_buffer, &background_color_idle);
} else {
_render_stereo(self, vk, cmd_buffer, &background_color_active);
}
os_mutex_unlock(&vk->cmd_pool_mutex);
VkResult res = vk_submit_cmd_buffer(vk, cmd_buffer);