OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: remove all entrypoint enabled debug option

Browse Source 
This was useful back at the dawn of time when apps weren't as
well developed and layers mostly sucked. I don't think it's been
used in a quite a while so remove it, as the new dispatch
layer doesn't support it.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8676>
This commit is contained in:
Dave Airlie
2021-01-25 11:32:22 +10:00
committed by Marge Bot
parent f695957421
commit abbca2fa92
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/envvars.rst
View File

@@ -552,8 +552,6 @@ RADV driver environment variables
enable LLVM compiler backend enable LLVM compiler backend
``allbos`` ``allbos``
force all allocated buffers to be referenced in submissions force all allocated buffers to be referenced in submissions
``allentrypoints``
enable all device/instance entrypoints
``checkir`` ``checkir``
validate the LLVM IR before LLVM compiles the shader validate the LLVM IR before LLVM compiles the shader
``errors`` ``errors``

2
src/amd/vulkan/radv_debug.h
View File

@@ -51,7 +51,7 @@ enum {
RADV_DEBUG_NOTHREADLLVM = 1u << 20, RADV_DEBUG_NOTHREADLLVM = 1u << 20,
RADV_DEBUG_NOBINNING = 1u << 21, RADV_DEBUG_NOBINNING = 1u << 21,
RADV_DEBUG_NO_NGG = 1u << 22, RADV_DEBUG_NO_NGG = 1u << 22,
RADV_DEBUG_ALL_ENTRYPOINTS = 1u << 23, /* spare 1u << 23 */
RADV_DEBUG_DUMP_META_SHADERS = 1u << 24, RADV_DEBUG_DUMP_META_SHADERS = 1u << 24,
RADV_DEBUG_NO_MEMORY_CACHE = 1u << 25, RADV_DEBUG_NO_MEMORY_CACHE = 1u << 25,
RADV_DEBUG_DISCARD_TO_DEMOTE = 1u << 26, RADV_DEBUG_DISCARD_TO_DEMOTE = 1u << 26,

16
src/amd/vulkan/radv_device.c
View File

@@ -555,7 +555,6 @@ static const struct debug_control radv_debug_options[] = {
{"nothreadllvm", RADV_DEBUG_NOTHREADLLVM}, {"nothreadllvm", RADV_DEBUG_NOTHREADLLVM},
{"nobinning", RADV_DEBUG_NOBINNING}, {"nobinning", RADV_DEBUG_NOBINNING},
{"nongg", RADV_DEBUG_NO_NGG}, {"nongg", RADV_DEBUG_NO_NGG},
{"allentrypoints", RADV_DEBUG_ALL_ENTRYPOINTS},
{"metashaders", RADV_DEBUG_DUMP_META_SHADERS}, {"metashaders", RADV_DEBUG_DUMP_META_SHADERS},
{"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE}, {"nomemorycache", RADV_DEBUG_NO_MEMORY_CACHE},
{"discardtodemote", RADV_DEBUG_DISCARD_TO_DEMOTE}, {"discardtodemote", RADV_DEBUG_DISCARD_TO_DEMOTE},
@@ -769,14 +768,11 @@ VkResult radv_CreateInstance(
instance->enabled_extensions.extensions[idx] = true; instance->enabled_extensions.extensions[idx] = true;
} }
bool unchecked = instance->debug_flags & RADV_DEBUG_ALL_ENTRYPOINTS;
for (unsigned i = 0; i < ARRAY_SIZE(instance->dispatch.entrypoints); i++) { for (unsigned i = 0; i < ARRAY_SIZE(instance->dispatch.entrypoints); i++) {
/* Vulkan requires that entrypoints for extensions which have /* Vulkan requires that entrypoints for extensions which have
* not been enabled must not be advertised. * not been enabled must not be advertised.
*/ */
if (!unchecked && if (!radv_instance_entrypoint_is_enabled(i, instance->apiVersion,
!radv_instance_entrypoint_is_enabled(i, instance->apiVersion,
&instance->enabled_extensions)) { &instance->enabled_extensions)) {
instance->dispatch.entrypoints[i] = NULL; instance->dispatch.entrypoints[i] = NULL;
} else { } else {
@@ -789,8 +785,7 @@ VkResult radv_CreateInstance(
/* Vulkan requires that entrypoints for extensions which have /* Vulkan requires that entrypoints for extensions which have
* not been enabled must not be advertised. * not been enabled must not be advertised.
*/ */
if (!unchecked && if (!radv_physical_device_entrypoint_is_enabled(i, instance->apiVersion,
!radv_physical_device_entrypoint_is_enabled(i, instance->apiVersion,
&instance->enabled_extensions)) { &instance->enabled_extensions)) {
instance->physical_device_dispatch.entrypoints[i] = NULL; instance->physical_device_dispatch.entrypoints[i] = NULL;
} else { } else {
@@ -803,8 +798,7 @@ VkResult radv_CreateInstance(
/* Vulkan requires that entrypoints for extensions which have /* Vulkan requires that entrypoints for extensions which have
* not been enabled must not be advertised. * not been enabled must not be advertised.
*/ */
if (!unchecked && if (!radv_device_entrypoint_is_enabled(i, instance->apiVersion,
!radv_device_entrypoint_is_enabled(i, instance->apiVersion,
&instance->enabled_extensions, NULL)) { &instance->enabled_extensions, NULL)) {
instance->device_dispatch.entrypoints[i] = NULL; instance->device_dispatch.entrypoints[i] = NULL;
} else { } else {
@@ -2631,7 +2625,6 @@ radv_device_init_dispatch(struct radv_device *device)
{ {
const struct radv_instance *instance = device->physical_device->instance; const struct radv_instance *instance = device->physical_device->instance;
const struct radv_device_dispatch_table *dispatch_table_layer = NULL; const struct radv_device_dispatch_table *dispatch_table_layer = NULL;
bool unchecked = instance->debug_flags & RADV_DEBUG_ALL_ENTRYPOINTS;
if (radv_thread_trace_enabled()) { if (radv_thread_trace_enabled()) {
/* Use device entrypoints from the SQTT layer if enabled. */ /* Use device entrypoints from the SQTT layer if enabled. */
@@ -2642,8 +2635,7 @@ radv_device_init_dispatch(struct radv_device *device)
/* Vulkan requires that entrypoints for extensions which have not been /* Vulkan requires that entrypoints for extensions which have not been
* enabled must not be advertised. * enabled must not be advertised.
*/ */
if (!unchecked && if (!radv_device_entrypoint_is_enabled(i, instance->apiVersion,
!radv_device_entrypoint_is_enabled(i, instance->apiVersion,
&instance->enabled_extensions, &instance->enabled_extensions,
&device->enabled_extensions)) { &device->enabled_extensions)) {
device->dispatch.entrypoints[i] = NULL; device->dispatch.entrypoints[i] = NULL;