mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2026-04-15 08:22:07 -04:00
matrix: move to util/
wlr_matrix is not a standalone type like other headers in types/, it's more of an internal utility. Move it to the appropriate place.
This commit is contained in:
parent
c1eb053f5e
commit
639ca05d35
8 changed files with 6 additions and 8 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef TYPES_WLR_MATRIX_H
|
#ifndef UTIL_MATRIX_H
|
||||||
#define TYPES_WLR_MATRIX_H
|
#define UTIL_MATRIX_H
|
||||||
|
|
||||||
#include <wayland-server-protocol.h>
|
#include <wayland-server-protocol.h>
|
||||||
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
#include <wlr/util/transform.h>
|
#include <wlr/util/transform.h>
|
||||||
#include "render/egl.h"
|
#include "render/egl.h"
|
||||||
#include "render/gles2.h"
|
#include "render/gles2.h"
|
||||||
#include "types/wlr_matrix.h"
|
#include "util/matrix.h"
|
||||||
|
|
||||||
#define MAX_QUADS 86 // 4kb
|
#define MAX_QUADS 86 // 4kb
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,6 @@
|
||||||
#include "render/egl.h"
|
#include "render/egl.h"
|
||||||
#include "render/gles2.h"
|
#include "render/gles2.h"
|
||||||
#include "render/pixel_format.h"
|
#include "render/pixel_format.h"
|
||||||
#include "types/wlr_matrix.h"
|
|
||||||
#include "util/time.h"
|
#include "util/time.h"
|
||||||
|
|
||||||
#include "common_vert_src.h"
|
#include "common_vert_src.h"
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#include "render/color.h"
|
#include "render/color.h"
|
||||||
#include "render/vulkan.h"
|
#include "render/vulkan.h"
|
||||||
#include "types/wlr_matrix.h"
|
#include "util/matrix.h"
|
||||||
|
|
||||||
static const struct wlr_render_pass_impl render_pass_impl;
|
static const struct wlr_render_pass_impl render_pass_impl;
|
||||||
static const struct wlr_addon_interface vk_color_transform_impl;
|
static const struct wlr_addon_interface vk_color_transform_impl;
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@
|
||||||
#include "render/vulkan/shaders/quad.frag.h"
|
#include "render/vulkan/shaders/quad.frag.h"
|
||||||
#include "render/vulkan/shaders/output.frag.h"
|
#include "render/vulkan/shaders/output.frag.h"
|
||||||
#include "types/wlr_buffer.h"
|
#include "types/wlr_buffer.h"
|
||||||
#include "types/wlr_matrix.h"
|
|
||||||
#include "util/time.h"
|
#include "util/time.h"
|
||||||
|
|
||||||
// TODO:
|
// TODO:
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,6 @@ wlr_files += files(
|
||||||
'wlr_layer_shell_v1.c',
|
'wlr_layer_shell_v1.c',
|
||||||
'wlr_linux_dmabuf_v1.c',
|
'wlr_linux_dmabuf_v1.c',
|
||||||
'wlr_linux_drm_syncobj_v1.c',
|
'wlr_linux_drm_syncobj_v1.c',
|
||||||
'wlr_matrix.c',
|
|
||||||
'wlr_output_layer.c',
|
'wlr_output_layer.c',
|
||||||
'wlr_output_layout.c',
|
'wlr_output_layout.c',
|
||||||
'wlr_output_management_v1.c',
|
'wlr_output_management_v1.c',
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
#include <wayland-server-protocol.h>
|
#include <wayland-server-protocol.h>
|
||||||
#include <wlr/types/wlr_output.h>
|
#include <wlr/types/wlr_output.h>
|
||||||
#include <wlr/util/box.h>
|
#include <wlr/util/box.h>
|
||||||
#include "types/wlr_matrix.h"
|
#include "util/matrix.h"
|
||||||
|
|
||||||
void wlr_matrix_identity(float mat[static 9]) {
|
void wlr_matrix_identity(float mat[static 9]) {
|
||||||
static const float identity[9] = {
|
static const float identity[9] = {
|
||||||
|
|
@ -5,6 +5,7 @@ wlr_files += files(
|
||||||
'env.c',
|
'env.c',
|
||||||
'global.c',
|
'global.c',
|
||||||
'log.c',
|
'log.c',
|
||||||
|
'matrix.c',
|
||||||
'rect_union.c',
|
'rect_union.c',
|
||||||
'region.c',
|
'region.c',
|
||||||
'set.c',
|
'set.c',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue