return screen->props.limits.maxColorAttachments;
case PIPE_CAP_OCCLUSION_QUERY:
+ return 1;
+
+#if 0 /* TODO: Enable me */
case PIPE_CAP_QUERY_TIME_ELAPSED:
return 1;
+#endif
case PIPE_CAP_TEXTURE_SWIZZLE:
return 1;
return 1;
case PIPE_CAP_FRAGMENT_SHADER_TEXTURE_LOD:
+ return 0; /* TODO: re-enable after implementing nir_texop_txd */
+
case PIPE_CAP_FRAGMENT_SHADER_DERIVATIVES:
case PIPE_CAP_VERTEX_SHADER_SATURATE:
return 1;
case PIPE_CAP_GLSL_FEATURE_LEVEL:
case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
- return 450; /* unsure (probably wrong) */
+ return 120;
#if 0 /* TODO: Enable me */
case PIPE_CAP_COMPUTE:
case PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT:
return screen->props.limits.minUniformBufferOffsetAlignment;
+#if 0 /* TODO: Enable me */
case PIPE_CAP_QUERY_TIMESTAMP:
return 1;
+#endif
case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT:
return screen->props.limits.minMemoryMapAlignment;
case PIPE_CAP_VIDEO_MEMORY:
return get_video_mem(screen);
case PIPE_CAP_UMA:
- /* inaccurate */
return screen->props.deviceType == VK_PHYSICAL_DEVICE_TYPE_INTEGRATED_GPU;
case PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE:
return 1;
#endif
+#if 0 /* TODO: Enable me */
+ case PIPE_CAP_CLIP_HALFZ:
+ return 1;
+#endif
+
#if 0 /* TODO: Enable me */
case PIPE_CAP_TEXTURE_FLOAT_LINEAR:
case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR:
return 0;
case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
- return 1;
+ return 0;
case PIPE_CAP_NIR_COMPACT_ARRAYS:
return 1;
+ case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL:
+ return 1;
+
case PIPE_CAP_FLATSHADE:
case PIPE_CAP_ALPHA_TEST:
case PIPE_CAP_CLIP_PLANES:
+ case PIPE_CAP_POINT_SIZE_FIXED:
+ case PIPE_CAP_TWO_SIDED_COLOR:
return 0;
+ case PIPE_CAP_DMABUF:
+ return screen->have_KHR_external_memory_fd;
+
default:
return u_pipe_screen_get_param_defaults(pscreen, param);
}
case PIPE_SHADER_CAP_MAX_TEMPS:
return INT_MAX;
+ case PIPE_SHADER_CAP_INTEGERS:
+ return 1;
+
case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR:
case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR:
case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR:
case PIPE_SHADER_CAP_INDIRECT_CONST_ADDR:
case PIPE_SHADER_CAP_SUBROUTINES:
- case PIPE_SHADER_CAP_INTEGERS:
case PIPE_SHADER_CAP_INT64_ATOMICS:
case PIPE_SHADER_CAP_FP16:
return 0; /* not implemented */
MAP_FORMAT_INT(R8G8B8A8)
MAP_FORMAT_SRGB(R8G8B8A8)
[PIPE_FORMAT_B8G8R8A8_UNORM] = VK_FORMAT_B8G8R8A8_UNORM,
+ [PIPE_FORMAT_B8G8R8X8_UNORM] = VK_FORMAT_B8G8R8A8_UNORM,
MAP_FORMAT_SRGB(B8G8R8A8)
[PIPE_FORMAT_A8B8G8R8_SRGB] = VK_FORMAT_A8B8G8R8_SRGB_PACK32,
// 16-bits
[PIPE_FORMAT_DXT1_RGBA] = VK_FORMAT_BC1_RGBA_UNORM_BLOCK,
[PIPE_FORMAT_DXT3_RGBA] = VK_FORMAT_BC2_UNORM_BLOCK,
[PIPE_FORMAT_DXT5_RGBA] = VK_FORMAT_BC3_UNORM_BLOCK,
+ [PIPE_FORMAT_DXT1_SRGB] = VK_FORMAT_BC1_RGB_SRGB_BLOCK,
+ [PIPE_FORMAT_DXT1_SRGBA] = VK_FORMAT_BC1_RGBA_SRGB_BLOCK,
+ [PIPE_FORMAT_DXT3_SRGBA] = VK_FORMAT_BC2_SRGB_BLOCK,
+ [PIPE_FORMAT_DXT5_SRGBA] = VK_FORMAT_BC3_SRGB_BLOCK,
+
[PIPE_FORMAT_RGTC1_UNORM] = VK_FORMAT_BC4_UNORM_BLOCK,
[PIPE_FORMAT_RGTC1_SNORM] = VK_FORMAT_BC4_SNORM_BLOCK,
[PIPE_FORMAT_RGTC2_UNORM] = VK_FORMAT_BC5_UNORM_BLOCK,
[PIPE_FORMAT_BPTC_RGB_UFLOAT] = VK_FORMAT_BC6H_UFLOAT_BLOCK,
};
+static bool
+is_depth_format_supported(struct zink_screen *screen, VkFormat format)
+{
+ VkFormatProperties props;
+ vkGetPhysicalDeviceFormatProperties(screen->pdev, format, &props);
+ return (props.linearTilingFeatures | props.optimalTilingFeatures) &
+ VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT;
+}
+
VkFormat
-zink_get_format(enum pipe_format format)
+zink_get_format(struct zink_screen *screen, enum pipe_format format)
+{
+ VkFormat ret = formats[format];
+
+ if (ret == VK_FORMAT_X8_D24_UNORM_PACK32 &&
+ !screen->have_X8_D24_UNORM_PACK32) {
+ assert(is_depth_format_supported(screen, VK_FORMAT_D32_SFLOAT));
+ return VK_FORMAT_D32_SFLOAT;
+ }
+
+ if (ret == VK_FORMAT_D24_UNORM_S8_UINT &&
+ !screen->have_D24_UNORM_S8_UINT) {
+ assert(is_depth_format_supported(screen, VK_FORMAT_D32_SFLOAT_S8_UINT));
+ return VK_FORMAT_D32_SFLOAT_S8_UINT;
+ }
+
+ return ret;
+}
+
+static VkSampleCountFlagBits
+vk_sample_count_flags(uint32_t sample_count)
{
- return formats[format];
+ switch (sample_count) {
+ case 1: return VK_SAMPLE_COUNT_1_BIT;
+ case 2: return VK_SAMPLE_COUNT_2_BIT;
+ case 4: return VK_SAMPLE_COUNT_4_BIT;
+ case 8: return VK_SAMPLE_COUNT_8_BIT;
+ case 16: return VK_SAMPLE_COUNT_16_BIT;
+ case 32: return VK_SAMPLE_COUNT_32_BIT;
+ case 64: return VK_SAMPLE_COUNT_64_BIT;
+ default:
+ return 0;
+ }
}
static bool
{
struct zink_screen *screen = zink_screen(pscreen);
- if (sample_count > 1)
- return FALSE;
+ if (format == PIPE_FORMAT_NONE)
+ return screen->props.limits.framebufferNoAttachmentsSampleCounts &
+ vk_sample_count_flags(sample_count);
- VkFormat vkformat = formats[format];
+ VkFormat vkformat = zink_get_format(screen, format);
if (vkformat == VK_FORMAT_UNDEFINED)
return FALSE;
+ if (sample_count >= 1) {
+ VkSampleCountFlagBits sample_mask = vk_sample_count_flags(sample_count);
+ const struct util_format_description *desc = util_format_description(format);
+ if (util_format_is_depth_or_stencil(format)) {
+ if (util_format_has_depth(desc)) {
+ if (bind & PIPE_BIND_DEPTH_STENCIL &&
+ (screen->props.limits.framebufferDepthSampleCounts & sample_mask) != sample_mask)
+ return FALSE;
+ if (bind & PIPE_BIND_SAMPLER_VIEW &&
+ (screen->props.limits.sampledImageDepthSampleCounts & sample_mask) != sample_mask)
+ return FALSE;
+ }
+ if (util_format_has_stencil(desc)) {
+ if (bind & PIPE_BIND_DEPTH_STENCIL &&
+ (screen->props.limits.framebufferStencilSampleCounts & sample_mask) != sample_mask)
+ return FALSE;
+ if (bind & PIPE_BIND_SAMPLER_VIEW &&
+ (screen->props.limits.sampledImageStencilSampleCounts & sample_mask) != sample_mask)
+ return FALSE;
+ }
+ } else if (util_format_is_pure_integer(format)) {
+ if (bind & PIPE_BIND_RENDER_TARGET &&
+ !(screen->props.limits.framebufferColorSampleCounts & sample_mask))
+ return FALSE;
+ if (bind & PIPE_BIND_SAMPLER_VIEW &&
+ !(screen->props.limits.sampledImageIntegerSampleCounts & sample_mask))
+ return FALSE;
+ } else {
+ if (bind & PIPE_BIND_RENDER_TARGET &&
+ !(screen->props.limits.framebufferColorSampleCounts & sample_mask))
+ return FALSE;
+ if (bind & PIPE_BIND_SAMPLER_VIEW &&
+ !(screen->props.limits.sampledImageColorSampleCounts & sample_mask))
+ return FALSE;
+ }
+ }
+
VkFormatProperties props;
vkGetPhysicalDeviceFormatProperties(screen->pdev, vkformat, &props);
return FALSE;
}
- const struct util_format_description *desc = util_format_description(format);
- if (desc->layout == UTIL_FORMAT_LAYOUT_BPTC &&
- !screen->feats.textureCompressionBC)
- return FALSE;
+ if (util_format_is_compressed(format)) {
+ const struct util_format_description *desc = util_format_description(format);
+ if (desc->layout == UTIL_FORMAT_LAYOUT_BPTC &&
+ !screen->feats.textureCompressionBC)
+ return FALSE;
+ }
return TRUE;
}
vkGetPhysicalDeviceFeatures(screen->pdev, &screen->feats);
vkGetPhysicalDeviceMemoryProperties(screen->pdev, &screen->mem_props);
+ screen->have_X8_D24_UNORM_PACK32 = is_depth_format_supported(screen,
+ VK_FORMAT_X8_D24_UNORM_PACK32);
+ screen->have_D24_UNORM_S8_UINT = is_depth_format_supported(screen,
+ VK_FORMAT_D24_UNORM_S8_UINT);
+
uint32_t num_extensions = 0;
if (vkEnumerateDeviceExtensionProperties(screen->pdev, NULL,
&num_extensions, NULL) == VK_SUCCESS && num_extensions > 0) {
for (uint32_t i = 0; i < num_extensions; ++i) {
if (!strcmp(extensions[i].extensionName,
- VK_KHR_MAINTENANCE1_EXTENSION_NAME))
- screen->have_VK_KHR_maintenance1 = true;
+ VK_KHR_MAINTENANCE1_EXTENSION_NAME))
+ screen->have_KHR_maintenance1 = true;
+ if (!strcmp(extensions[i].extensionName,
+ VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME))
+ screen->have_KHR_external_memory_fd = true;
}
FREE(extensions);
}
}
+ if (!screen->have_KHR_maintenance1) {
+ debug_printf("ZINK: VK_KHR_maintenance1 required!\n");
+ goto fail;
+ }
+
VkDeviceQueueCreateInfo qci = {};
float dummy = 0.0f;
qci.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
dci.queueCreateInfoCount = 1;
dci.pQueueCreateInfos = &qci;
dci.pEnabledFeatures = &screen->feats;
- const char *extensions[] = {
+ const char *extensions[3] = {
VK_KHR_MAINTENANCE1_EXTENSION_NAME,
- VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME,
- VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME,
};
+ num_extensions = 1;
+
+ if (fd >= 0 && !screen->have_KHR_external_memory_fd) {
+ debug_printf("ZINK: KHR_external_memory_fd required!\n");
+ goto fail;
+ }
+
+ if (screen->have_KHR_external_memory_fd) {
+ extensions[num_extensions++] = VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME;
+ extensions[num_extensions++] = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME;
+ }
+ assert(num_extensions <= ARRAY_SIZE(extensions));
+
dci.ppEnabledExtensionNames = extensions;
- dci.enabledExtensionCount = ARRAY_SIZE(extensions);
+ dci.enabledExtensionCount = num_extensions;
if (vkCreateDevice(screen->pdev, &dci, NULL, &screen->dev) != VK_SUCCESS)
goto fail;
projects / mesa.git / blobdiff