mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-02 11:55:59 +01:00
render/vulkan: rename tex_features to shm_tex_features
These features are required for shm only: the TRANSFER stuff is for texture upload. We don't need these for DMA-BUFs. Make this clearer by changing the name. Also re-order the definitions to group all texture-related features together.
This commit is contained in:
parent
31d958f70a
commit
fdb199a43c
1 changed files with 5 additions and 5 deletions
|
@ -238,16 +238,16 @@ static const VkImageUsageFlags tex_usage =
|
||||||
static const VkImageUsageFlags dma_tex_usage =
|
static const VkImageUsageFlags dma_tex_usage =
|
||||||
VK_IMAGE_USAGE_SAMPLED_BIT;
|
VK_IMAGE_USAGE_SAMPLED_BIT;
|
||||||
|
|
||||||
static const VkFormatFeatureFlags tex_features =
|
static const VkFormatFeatureFlags render_features =
|
||||||
|
VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
|
||||||
|
VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT;
|
||||||
|
static const VkFormatFeatureFlags shm_tex_features =
|
||||||
VK_FORMAT_FEATURE_TRANSFER_SRC_BIT |
|
VK_FORMAT_FEATURE_TRANSFER_SRC_BIT |
|
||||||
VK_FORMAT_FEATURE_TRANSFER_DST_BIT |
|
VK_FORMAT_FEATURE_TRANSFER_DST_BIT |
|
||||||
VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
|
VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
|
||||||
// NOTE: we don't strictly require this, we could create a NEAREST
|
// NOTE: we don't strictly require this, we could create a NEAREST
|
||||||
// sampler for formats that need it, in case this ever makes problems.
|
// sampler for formats that need it, in case this ever makes problems.
|
||||||
VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
|
VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT;
|
||||||
static const VkFormatFeatureFlags render_features =
|
|
||||||
VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT |
|
|
||||||
VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BLEND_BIT;
|
|
||||||
static const VkFormatFeatureFlags dma_tex_features =
|
static const VkFormatFeatureFlags dma_tex_features =
|
||||||
VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
|
VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT |
|
||||||
// NOTE: we don't strictly require this, we could create a NEAREST
|
// NOTE: we don't strictly require this, we could create a NEAREST
|
||||||
|
@ -434,7 +434,7 @@ void vulkan_format_props_query(struct wlr_vk_device *dev,
|
||||||
|
|
||||||
// non-dmabuf texture properties
|
// non-dmabuf texture properties
|
||||||
const char *shm_texture_status;
|
const char *shm_texture_status;
|
||||||
if ((fmtp.formatProperties.optimalTilingFeatures & tex_features) == tex_features &&
|
if ((fmtp.formatProperties.optimalTilingFeatures & shm_tex_features) == shm_tex_features &&
|
||||||
!format->is_ycbcr) {
|
!format->is_ycbcr) {
|
||||||
VkPhysicalDeviceImageFormatInfo2 fmti = {
|
VkPhysicalDeviceImageFormatInfo2 fmti = {
|
||||||
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
|
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2,
|
||||||
|
|
Loading…
Reference in a new issue