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

xrt: name xrt_swapchain pointers consistently "xsc" or similar.

Browse source 
As is tradition.
This commit is contained in:
Ryan Pavlik 2020-06-09 15:29:46 -05:00
parent 45c977d199
commit e0e5aeceda
5 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/xrt/compositor/client/comp_gl_client.c
View file

@ -147,8 +147,8 @@ client_gl_compositor_layer_begin(struct xrt_compositor *xc,
static xrt_result_t static xrt_result_t
client_gl_compositor_layer_stereo_projection(struct xrt_compositor *xc, client_gl_compositor_layer_stereo_projection(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *l_sc, struct xrt_swapchain *l_xsc,
struct xrt_swapchain *r_sc, struct xrt_swapchain *r_xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
struct client_gl_compositor *c = client_gl_compositor(xc); struct client_gl_compositor *c = client_gl_compositor(xc);
@ -156,8 +156,8 @@ client_gl_compositor_layer_stereo_projection(struct xrt_compositor *xc,
assert(data->type == XRT_LAYER_STEREO_PROJECTION); assert(data->type == XRT_LAYER_STEREO_PROJECTION);
l_xscfd = &client_gl_swapchain(l_sc)->xscfd->base; l_xscfd = &client_gl_swapchain(l_xsc)->xscfd->base;
r_xscfd = &client_gl_swapchain(r_sc)->xscfd->base; r_xscfd = &client_gl_swapchain(r_xsc)->xscfd->base;
data->flip_y = true; data->flip_y = true;
return xrt_comp_layer_stereo_projection(&c->xcfd->base, xdev, l_xscfd, return xrt_comp_layer_stereo_projection(&c->xcfd->base, xdev, l_xscfd,
@ -167,7 +167,7 @@ client_gl_compositor_layer_stereo_projection(struct xrt_compositor *xc,
static xrt_result_t static xrt_result_t
client_gl_compositor_layer_quad(struct xrt_compositor *xc, client_gl_compositor_layer_quad(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *sc, struct xrt_swapchain *xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
struct client_gl_compositor *c = client_gl_compositor(xc); struct client_gl_compositor *c = client_gl_compositor(xc);
@ -175,7 +175,7 @@ client_gl_compositor_layer_quad(struct xrt_compositor *xc,
assert(data->type == XRT_LAYER_QUAD); assert(data->type == XRT_LAYER_QUAD);
xscfb = &client_gl_swapchain(sc)->xscfd->base; xscfb = &client_gl_swapchain(xsc)->xscfd->base;
data->flip_y = true; data->flip_y = true;
return xrt_comp_layer_quad(&c->xcfd->base, xdev, xscfb, data); return xrt_comp_layer_quad(&c->xcfd->base, xdev, xscfb, data);

12
src/xrt/compositor/client/comp_vk_client.c
View file

@ -177,8 +177,8 @@ client_vk_compositor_layer_begin(struct xrt_compositor *xc,
static xrt_result_t static xrt_result_t
client_vk_compositor_layer_stereo_projection(struct xrt_compositor *xc, client_vk_compositor_layer_stereo_projection(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *l_sc, struct xrt_swapchain *l_xsc,
struct xrt_swapchain *r_sc, struct xrt_swapchain *r_xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
struct client_vk_compositor *c = client_vk_compositor(xc); struct client_vk_compositor *c = client_vk_compositor(xc);
@ -186,8 +186,8 @@ client_vk_compositor_layer_stereo_projection(struct xrt_compositor *xc,
assert(data->type == XRT_LAYER_STEREO_PROJECTION); assert(data->type == XRT_LAYER_STEREO_PROJECTION);
l_xscfd = &client_vk_swapchain(l_sc)->xscfd->base; l_xscfd = &client_vk_swapchain(l_xsc)->xscfd->base;
r_xscfd = &client_vk_swapchain(r_sc)->xscfd->base; r_xscfd = &client_vk_swapchain(r_xsc)->xscfd->base;
data->flip_y = false; data->flip_y = false;
return xrt_comp_layer_stereo_projection(&c->xcfd->base, xdev, l_xscfd, return xrt_comp_layer_stereo_projection(&c->xcfd->base, xdev, l_xscfd,
@ -197,7 +197,7 @@ client_vk_compositor_layer_stereo_projection(struct xrt_compositor *xc,
static xrt_result_t static xrt_result_t
client_vk_compositor_layer_quad(struct xrt_compositor *xc, client_vk_compositor_layer_quad(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *sc, struct xrt_swapchain *xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
struct client_vk_compositor *c = client_vk_compositor(xc); struct client_vk_compositor *c = client_vk_compositor(xc);
@ -205,7 +205,7 @@ client_vk_compositor_layer_quad(struct xrt_compositor *xc,
assert(data->type == XRT_LAYER_QUAD); assert(data->type == XRT_LAYER_QUAD);
xscfb = &client_vk_swapchain(sc)->xscfd->base; xscfb = &client_vk_swapchain(xsc)->xscfd->base;
data->flip_y = false; data->flip_y = false;
return xrt_comp_layer_quad(&c->xcfd->base, xdev, xscfb, data); return xrt_comp_layer_quad(&c->xcfd->base, xdev, xscfb, data);

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

@ -295,8 +295,8 @@ compositor_layer_begin(struct xrt_compositor *xc,
static xrt_result_t static xrt_result_t
compositor_layer_stereo_projection(struct xrt_compositor *xc, compositor_layer_stereo_projection(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *l_sc, struct xrt_swapchain *l_xsc,
struct xrt_swapchain *r_sc, struct xrt_swapchain *r_xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
struct comp_compositor *c = comp_compositor(xc); struct comp_compositor *c = comp_compositor(xc);
@ -306,8 +306,8 @@ compositor_layer_stereo_projection(struct xrt_compositor *xc,
uint32_t layer_id = c->slots[slot_id].num_layers; uint32_t layer_id = c->slots[slot_id].num_layers;
struct comp_layer *layer = &c->slots[slot_id].layers[layer_id]; struct comp_layer *layer = &c->slots[slot_id].layers[layer_id];
layer->scs[0] = comp_swapchain(l_sc); layer->scs[0] = comp_swapchain(l_xsc);
layer->scs[1] = comp_swapchain(r_sc); layer->scs[1] = comp_swapchain(r_xsc);
layer->data = *data; layer->data = *data;
c->slots[slot_id].num_layers++; c->slots[slot_id].num_layers++;
@ -317,7 +317,7 @@ compositor_layer_stereo_projection(struct xrt_compositor *xc,
static xrt_result_t static xrt_result_t
compositor_layer_quad(struct xrt_compositor *xc, compositor_layer_quad(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *sc, struct xrt_swapchain *xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
struct comp_compositor *c = comp_compositor(xc); struct comp_compositor *c = comp_compositor(xc);
@ -327,7 +327,7 @@ compositor_layer_quad(struct xrt_compositor *xc,
uint32_t layer_id = c->slots[slot_id].num_layers; uint32_t layer_id = c->slots[slot_id].num_layers;
struct comp_layer *layer = &c->slots[slot_id].layers[layer_id]; struct comp_layer *layer = &c->slots[slot_id].layers[layer_id];
layer->scs[0] = comp_swapchain(sc); layer->scs[0] = comp_swapchain(xsc);
layer->scs[1] = NULL; layer->scs[1] = NULL;
layer->data = *data; layer->data = *data;

16
src/xrt/include/xrt/xrt_compositor.h
View file

@ -382,8 +382,8 @@ struct xrt_compositor
*/ */
xrt_result_t (*layer_stereo_projection)(struct xrt_compositor *xc, xrt_result_t (*layer_stereo_projection)(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *l_sc, struct xrt_swapchain *l_xsc,
struct xrt_swapchain *r_sc, struct xrt_swapchain *r_xsc,
struct xrt_layer_data *data); struct xrt_layer_data *data);
/*! /*!
@ -397,7 +397,7 @@ struct xrt_compositor
*/ */
xrt_result_t (*layer_quad)(struct xrt_compositor *xc, xrt_result_t (*layer_quad)(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *sc, struct xrt_swapchain *xsc,
struct xrt_layer_data *data); struct xrt_layer_data *data);
/*! /*!
@ -557,11 +557,11 @@ xrt_comp_layer_begin(struct xrt_compositor *xc,
static inline xrt_result_t static inline xrt_result_t
xrt_comp_layer_stereo_projection(struct xrt_compositor *xc, xrt_comp_layer_stereo_projection(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *l_sc, struct xrt_swapchain *l_xsc,
struct xrt_swapchain *r_sc, struct xrt_swapchain *r_xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
return xc->layer_stereo_projection(xc, xdev, l_sc, r_sc, data); return xc->layer_stereo_projection(xc, xdev, l_xsc, r_xsc, data);
} }
/*! /*!
@ -574,10 +574,10 @@ xrt_comp_layer_stereo_projection(struct xrt_compositor *xc,
static inline xrt_result_t static inline xrt_result_t
xrt_comp_layer_quad(struct xrt_compositor *xc, xrt_comp_layer_quad(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *sc, struct xrt_swapchain *xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
return xc->layer_quad(xc, xdev, sc, data); return xc->layer_quad(xc, xdev, xsc, data);
} }
/*! /*!

12
src/xrt/ipc/ipc_client_compositor.c
View file

@ -341,8 +341,8 @@ ipc_compositor_layer_begin(struct xrt_compositor *xc,
static xrt_result_t static xrt_result_t
ipc_compositor_layer_stereo_projection(struct xrt_compositor *xc, ipc_compositor_layer_stereo_projection(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *l_sc, struct xrt_swapchain *l_xsc,
struct xrt_swapchain *r_sc, struct xrt_swapchain *r_xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
struct ipc_client_compositor *icc = ipc_client_compositor(xc); struct ipc_client_compositor *icc = ipc_client_compositor(xc);
@ -350,8 +350,8 @@ ipc_compositor_layer_stereo_projection(struct xrt_compositor *xc,
struct ipc_shared_memory *ism = icc->ipc_c->ism; struct ipc_shared_memory *ism = icc->ipc_c->ism;
struct ipc_layer_slot *slot = &ism->slots[icc->layers.slot_id]; struct ipc_layer_slot *slot = &ism->slots[icc->layers.slot_id];
struct ipc_layer_entry *layer = &slot->layers[icc->layers.num_layers]; struct ipc_layer_entry *layer = &slot->layers[icc->layers.num_layers];
struct ipc_client_swapchain *l = ipc_client_swapchain(l_sc); struct ipc_client_swapchain *l = ipc_client_swapchain(l_xsc);
struct ipc_client_swapchain *r = ipc_client_swapchain(r_sc); struct ipc_client_swapchain *r = ipc_client_swapchain(r_xsc);
layer->xdev_id = 0; //! @todo Real id. layer->xdev_id = 0; //! @todo Real id.
layer->swapchain_ids[0] = l->id; layer->swapchain_ids[0] = l->id;
@ -367,7 +367,7 @@ ipc_compositor_layer_stereo_projection(struct xrt_compositor *xc,
static xrt_result_t static xrt_result_t
ipc_compositor_layer_quad(struct xrt_compositor *xc, ipc_compositor_layer_quad(struct xrt_compositor *xc,
struct xrt_device *xdev, struct xrt_device *xdev,
struct xrt_swapchain *sc, struct xrt_swapchain *xsc,
struct xrt_layer_data *data) struct xrt_layer_data *data)
{ {
struct ipc_client_compositor *icc = ipc_client_compositor(xc); struct ipc_client_compositor *icc = ipc_client_compositor(xc);
@ -375,7 +375,7 @@ ipc_compositor_layer_quad(struct xrt_compositor *xc,
struct ipc_shared_memory *ism = icc->ipc_c->ism; struct ipc_shared_memory *ism = icc->ipc_c->ism;
struct ipc_layer_slot *slot = &ism->slots[icc->layers.slot_id]; struct ipc_layer_slot *slot = &ism->slots[icc->layers.slot_id];
struct ipc_layer_entry *layer = &slot->layers[icc->layers.num_layers]; struct ipc_layer_entry *layer = &slot->layers[icc->layers.num_layers];
struct ipc_client_swapchain *ics = ipc_client_swapchain(sc); struct ipc_client_swapchain *ics = ipc_client_swapchain(xsc);
assert(data->type == XRT_LAYER_QUAD); assert(data->type == XRT_LAYER_QUAD);