diff options
| author | Simon Ser <contact@emersion.fr> | 2021-11-16 22:51:06 +0100 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2021-11-17 16:12:59 +0000 |
| commit | a04cfca4da42d1cc01047c1cd9e60ef504beae98 (patch) | |
| tree | b388fc9f851a7784881cb70509b033bb680f3db8 /include | |
| parent | 9a4e1095cad154b7f8ce41cedbfb1e9a7e137d66 (diff) | |
| download | wlroots-a04cfca4da42d1cc01047c1cd9e60ef504beae98.tar.xz | |
Remove support for DMA-BUF flags
They are never used in practice, which makes all of our flag
handling effectively dead code. Also, APIs such as KMS don't
provide a good way to deal with the flags. Let's just fail the
DMA-BUF import when clients provide flags.
Diffstat (limited to 'include')
| -rw-r--r-- | include/render/gles2.h | 2 | ||||
| -rw-r--r-- | include/render/vulkan.h | 1 | ||||
| -rw-r--r-- | include/wlr/render/dmabuf.h | 7 | ||||
| -rw-r--r-- | include/wlr/render/gles2.h | 1 |
4 files changed, 0 insertions, 11 deletions
diff --git a/include/render/gles2.h b/include/render/gles2.h index fb2de1ab..245b2804 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -24,7 +24,6 @@ struct wlr_gles2_pixel_format { struct wlr_gles2_tex_shader { GLuint program; GLint proj; - GLint invert_y; GLint tex; GLint alpha; GLint pos_attrib; @@ -101,7 +100,6 @@ struct wlr_gles2_texture { EGLImageKHR image; - bool inverted_y; bool has_alpha; // Only affects target == GL_TEXTURE_2D diff --git a/include/render/vulkan.h b/include/render/vulkan.h index aa40198c..1cba5a19 100644 --- a/include/render/vulkan.h +++ b/include/render/vulkan.h @@ -246,7 +246,6 @@ struct wlr_vk_texture { bool dmabuf_imported; bool owned; // if dmabuf_imported: whether we have ownership of the image bool transitioned; // if dma_imported: whether we transitioned it away from preinit - bool invert_y; // if dma_imported: whether we must flip y struct wl_list foreign_link; struct wl_list destroy_link; struct wl_list link; // wlr_gles2_renderer.textures diff --git a/include/wlr/render/dmabuf.h b/include/wlr/render/dmabuf.h index 75892d30..76aad629 100644 --- a/include/wlr/render/dmabuf.h +++ b/include/wlr/render/dmabuf.h @@ -14,16 +14,9 @@ #define WLR_DMABUF_MAX_PLANES 4 -enum wlr_dmabuf_attributes_flags { - WLR_DMABUF_ATTRIBUTES_FLAGS_Y_INVERT = 1 << 0, - WLR_DMABUF_ATTRIBUTES_FLAGS_INTERLACED = 1 << 1, - WLR_DMABUF_ATTRIBUTES_FLAGS_BOTTOM_FIRST = 1 << 2, -}; - struct wlr_dmabuf_attributes { int32_t width, height; uint32_t format; - uint32_t flags; // enum wlr_dmabuf_attributes_flags uint64_t modifier; int n_planes; diff --git a/include/wlr/render/gles2.h b/include/wlr/render/gles2.h index dabe49dd..e6844ce9 100644 --- a/include/wlr/render/gles2.h +++ b/include/wlr/render/gles2.h @@ -30,7 +30,6 @@ struct wlr_gles2_texture_attribs { GLenum target; /* either GL_TEXTURE_2D or GL_TEXTURE_EXTERNAL_OES */ GLuint tex; - bool inverted_y; bool has_alpha; }; |