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

comp/main: near and far are keywords on Windows.

Browse source
This commit is contained in:
Ryan Pavlik 2020-11-18 16:46:31 -06:00
parent 66811b436a
commit 6fbd12bde4
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/changes/misc_features/mr.551.md
View file

@ -1 +1,4 @@
---
- mr.605
---
Work toward a Win32 port.

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

@ -502,8 +502,8 @@ _init(struct comp_layer_renderer *self,
{
self->vk = vk;
self->near = 0.001f;
self->far = 100.0f;
self->nearZ = 0.001f;
self->farZ = 100.0f;
self->sample_count = VK_SAMPLE_COUNT_1_BIT;
self->num_layers = 0;
@ -722,9 +722,10 @@ comp_layer_renderer_set_fov(struct comp_layer_renderer *self,
const float a31 = (tan_right + tan_left) / tan_width;
const float a32 = (tan_up + tan_down) / tan_height;
const float a33 = -self->far / (self->far - self->near);
const float a33 = -self->farZ / (self->farZ - self->nearZ);
const float a43 = -(self->far * self->near) / (self->far - self->near);
const float a43 =
-(self->farZ * self->nearZ) / (self->farZ - self->nearZ);
// clang-format off
self->mat_projection[eye] = (struct xrt_matrix_4x4) {

4
src/xrt/compositor/main/comp_layer_renderer.h
View file

@ -52,8 +52,8 @@ struct comp_layer_renderer
struct vk_buffer vertex_buffer;
float near;
float far;
float nearZ;
float farZ;
struct comp_render_layer **layers;
uint32_t num_layers;