get_video_mem(struct zink_screen *screen)
{
VkDeviceSize size = 0;
- for (uint32_t i = 0; i < screen->mem_props.memoryHeapCount; ++i)
- size += screen->mem_props.memoryHeaps[i].size;
+ for (uint32_t i = 0; i < screen->mem_props.memoryHeapCount; ++i) {
+ if (screen->mem_props.memoryHeaps[i].flags &
+ VK_MEMORY_HEAP_DEVICE_LOCAL_BIT)
+ size += screen->mem_props.memoryHeaps[i].size;
+ }
return (int)(size >> 20);
}
switch (param) {
case PIPE_CAP_NPOT_TEXTURES:
+ case PIPE_CAP_TGSI_TEXCOORD:
return 1;
case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
return 1;
#endif
+ case PIPE_CAP_TEXTURE_MULTISAMPLE:
+ return 1;
+
case PIPE_CAP_TEXTURE_SWIZZLE:
return 1;
case PIPE_CAP_INDEP_BLEND_FUNC:
return 1;
+ case PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS:
+ return screen->have_EXT_transform_feedback ? screen->tf_props.maxTransformFeedbackBuffers : 0;
+ case PIPE_CAP_STREAM_OUTPUT_PAUSE_RESUME:
+ case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS:
+ return 1;
+
case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
return screen->props.limits.maxImageArrayLayers;
-#if 0 /* TODO: Enable me */
case PIPE_CAP_DEPTH_CLIP_DISABLE:
- return 0;
-#endif
+ return screen->feats.depthClamp;
case PIPE_CAP_TGSI_INSTANCEID:
case PIPE_CAP_MIXED_COLORBUFFER_FORMATS:
case PIPE_CAP_GLSL_FEATURE_LEVEL:
case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
- return 120;
+ return 130;
#if 0 /* TODO: Enable me */
case PIPE_CAP_COMPUTE:
case PIPE_CAP_PCI_FUNCTION:
return 0; /* TODO: figure these out */
-#if 0 /* TODO: Enable me */
case PIPE_CAP_CULL_DISTANCE:
return screen->feats.shaderCullDistance;
-#endif
case PIPE_CAP_VIEWPORT_SUBPIXEL_BITS:
return screen->props.limits.viewportSubPixelBits;
case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL:
return 1;
+ case PIPE_CAP_VIEWPORT_TRANSFORM_LOWERED:
+ return 1;
+
case PIPE_CAP_FLATSHADE:
case PIPE_CAP_ALPHA_TEST:
case PIPE_CAP_CLIP_PLANES:
case PIPE_SHADER_CAP_SUBROUTINES:
case PIPE_SHADER_CAP_INT64_ATOMICS:
case PIPE_SHADER_CAP_FP16:
+ case PIPE_SHADER_CAP_FP16_DERIVATIVES:
+ case PIPE_SHADER_CAP_INT16:
+ case PIPE_SHADER_CAP_GLSL_16BIT_TEMPS:
return 0; /* not implemented */
case PIPE_SHADER_CAP_PREFERRED_IR:
case PIPE_SHADER_CAP_MAX_SHADER_BUFFERS:
/* TODO: this limitation is dumb, and will need some fixes in mesa */
- return MIN2(screen->props.limits.maxPerStageDescriptorStorageBuffers, 8);
+ return MIN2(screen->props.limits.maxPerStageDescriptorStorageBuffers, PIPE_MAX_SHADER_BUFFERS);
case PIPE_SHADER_CAP_SUPPORTED_IRS:
return (1 << PIPE_SHADER_IR_NIR) | (1 << PIPE_SHADER_IR_TGSI);
case PIPE_SHADER_CAP_MAX_SHADER_IMAGES:
+#if 0 /* TODO: needs compiler support */
return MIN2(screen->props.limits.maxPerStageDescriptorStorageImages,
PIPE_MAX_SHADER_IMAGES);
+#else
+ return 0;
+#endif
case PIPE_SHADER_CAP_LOWER_IF_THRESHOLD:
case PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS:
return pdev;
}
-static uint32_t
-find_gfx_queue(const VkPhysicalDevice pdev)
+static void
+update_queue_props(struct zink_screen *screen)
{
uint32_t num_queues;
- vkGetPhysicalDeviceQueueFamilyProperties(pdev, &num_queues, NULL);
+ vkGetPhysicalDeviceQueueFamilyProperties(screen->pdev, &num_queues, NULL);
assert(num_queues > 0);
VkQueueFamilyProperties *props = malloc(sizeof(*props) * num_queues);
- vkGetPhysicalDeviceQueueFamilyProperties(pdev, &num_queues, props);
+ vkGetPhysicalDeviceQueueFamilyProperties(screen->pdev, &num_queues, props);
for (uint32_t i = 0; i < num_queues; i++) {
if (props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
- free(props);
- return i;
+ screen->gfx_queue = i;
+ screen->timestamp_valid_bits = props[i].timestampValidBits;
+ assert(screen->timestamp_valid_bits);
+ break;
}
}
-
- return UINT32_MAX;
+ free(props);
}
static void
if (!screen->vk_##x) \
return false; \
} while (0)
-
+ if (screen->have_EXT_transform_feedback) {
+ GET_PROC_ADDR(CmdBindTransformFeedbackBuffersEXT);
+ GET_PROC_ADDR(CmdBeginTransformFeedbackEXT);
+ GET_PROC_ADDR(CmdEndTransformFeedbackEXT);
+ GET_PROC_ADDR(CmdBeginQueryIndexedEXT);
+ GET_PROC_ADDR(CmdEndQueryIndexedEXT);
+ GET_PROC_ADDR(CmdDrawIndirectByteCountEXT);
+ }
if (screen->have_KHR_external_memory_fd)
GET_PROC_ADDR(GetMemoryFdKHR);
zink_internal_create_screen(struct sw_winsys *winsys, int fd)
{
struct zink_screen *screen = CALLOC_STRUCT(zink_screen);
+ bool have_tf_ext = false, have_cond_render_ext = false, have_EXT_index_type_uint8 = false,
+ have_EXT_robustness2_features = false, have_EXT_vertex_attribute_divisor = false;
if (!screen)
return NULL;
screen->instance = create_instance();
screen->pdev = choose_pdev(screen->instance);
- screen->gfx_queue = find_gfx_queue(screen->pdev);
+ update_queue_props(screen);
- vkGetPhysicalDeviceProperties(screen->pdev, &screen->props);
- vkGetPhysicalDeviceFeatures(screen->pdev, &screen->feats);
vkGetPhysicalDeviceMemoryProperties(screen->pdev, &screen->mem_props);
screen->have_X8_D24_UNORM_PACK32 = zink_is_depth_format_supported(screen,
screen->have_KHR_external_memory_fd = true;
if (!strcmp(extensions[i].extensionName,
VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME))
- screen->have_EXT_conditional_rendering = true;
+ have_cond_render_ext = true;
+ if (!strcmp(extensions[i].extensionName,
+ VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME))
+ have_tf_ext = true;
+ if (!strcmp(extensions[i].extensionName,
+ VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME))
+ have_EXT_index_type_uint8 = true;
+ if (!strcmp(extensions[i].extensionName,
+ VK_EXT_ROBUSTNESS_2_EXTENSION_NAME))
+ have_EXT_robustness2_features = true;
+ if (!strcmp(extensions[i].extensionName,
+ VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME))
+ have_EXT_vertex_attribute_divisor = true;
+
}
FREE(extensions);
}
}
+ VkPhysicalDeviceFeatures2 feats = {};
+ VkPhysicalDeviceTransformFeedbackFeaturesEXT tf_feats = {};
+ VkPhysicalDeviceConditionalRenderingFeaturesEXT cond_render_feats = {};
+ VkPhysicalDeviceIndexTypeUint8FeaturesEXT index_uint8_feats = {};
+
+ feats.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
+ if (have_tf_ext) {
+ tf_feats.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT;
+ tf_feats.pNext = feats.pNext;
+ feats.pNext = &tf_feats;
+ }
+ if (have_cond_render_ext) {
+ cond_render_feats.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT;
+ cond_render_feats.pNext = feats.pNext;
+ feats.pNext = &cond_render_feats;
+ }
+ if (have_EXT_index_type_uint8) {
+ index_uint8_feats.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_INDEX_TYPE_UINT8_FEATURES_EXT;
+ index_uint8_feats.pNext = feats.pNext;
+ feats.pNext = &index_uint8_feats;
+ }
+ if (have_EXT_robustness2_features) {
+ screen->rb2_feats.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_FEATURES_EXT;
+ screen->rb2_feats.pNext = feats.pNext;
+ feats.pNext = &screen->rb2_feats;
+ }
+ if (have_EXT_vertex_attribute_divisor) {
+ screen->vdiv_feats.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT;
+ screen->vdiv_feats.pNext = feats.pNext;
+ feats.pNext = &screen->vdiv_feats;
+ }
+ vkGetPhysicalDeviceFeatures2(screen->pdev, &feats);
+ memcpy(&screen->feats, &feats.features, sizeof(screen->feats));
+ if (have_tf_ext && tf_feats.transformFeedback)
+ screen->have_EXT_transform_feedback = true;
+ if (have_cond_render_ext && cond_render_feats.conditionalRendering)
+ screen->have_EXT_conditional_rendering = true;
+ if (have_EXT_index_type_uint8 && index_uint8_feats.indexTypeUint8)
+ screen->have_EXT_index_type_uint8 = true;
+ screen->have_EXT_robustness2_features = have_EXT_robustness2_features;
+ if (have_EXT_vertex_attribute_divisor && screen->vdiv_feats.vertexAttributeInstanceRateDivisor)
+ screen->have_EXT_vertex_attribute_divisor = true;
+
+ VkPhysicalDeviceProperties2 props = {};
+ VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vdiv_props = {};
+ props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
+ if (screen->have_EXT_transform_feedback) {
+ screen->tf_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT;
+ screen->tf_props.pNext = props.pNext;
+ props.pNext = &screen->tf_props;
+ }
+ if (have_EXT_robustness2_features) {
+ screen->rb2_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ROBUSTNESS_2_PROPERTIES_EXT;
+ screen->rb2_props.pNext = props.pNext;
+ props.pNext = &screen->rb2_props;
+ }
+ if (have_EXT_vertex_attribute_divisor) {
+ vdiv_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT;
+ vdiv_props.pNext = props.pNext;
+ props.pNext = &vdiv_props;
+ }
+ vkGetPhysicalDeviceProperties2(screen->pdev, &props);
+ memcpy(&screen->props, &props.properties, sizeof(screen->props));
+ screen->max_vertex_attrib_divisor = vdiv_props.maxVertexAttribDivisor;
if (!screen->have_KHR_maintenance1) {
debug_printf("ZINK: VK_KHR_maintenance1 required!\n");
dci.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
dci.queueCreateInfoCount = 1;
dci.pQueueCreateInfos = &qci;
- dci.pEnabledFeatures = &screen->feats;
- const char *extensions[4] = {
+ /* extensions don't have bool members in pEnabledFeatures.
+ * this requires us to pass the whole VkPhysicalDeviceFeatures2 struct
+ */
+ dci.pNext = &feats;
+ const char *extensions[8] = {
VK_KHR_MAINTENANCE1_EXTENSION_NAME,
};
num_extensions = 1;
if (screen->have_EXT_conditional_rendering)
extensions[num_extensions++] = VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME;
+ if (screen->have_EXT_index_type_uint8)
+ extensions[num_extensions++] = VK_EXT_INDEX_TYPE_UINT8_EXTENSION_NAME;
+
+ if (screen->have_EXT_transform_feedback)
+ extensions[num_extensions++] = VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME;
+ if (screen->have_EXT_robustness2_features)
+ extensions[num_extensions++] = VK_EXT_ROBUSTNESS_2_EXTENSION_NAME;
+ if (screen->have_EXT_vertex_attribute_divisor)
+ extensions[num_extensions++] = VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME;
assert(num_extensions <= ARRAY_SIZE(extensions));
dci.ppEnabledExtensionNames = extensions;
projects / mesa.git / blobdiff