AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: move all driverID checks to a helper function

Browse Source 
no functional changes

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29964>
This commit is contained in:
Mike Blumenkrantz
2024-06-28 10:22:40 -04:00
committed by Marge Bot
parent f48b3bee31
commit f9d451e837
5 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_bo.c
+1 -1
View File
@@ -617,7 +617,7 @@ zink_bo_create(struct zink_screen *screen, uint64_t size, unsigned alignment, en
bool reclaim_all = false;
if (heap == ZINK_HEAP_DEVICE_LOCAL_VISIBLE && !screen->resizable_bar) {
unsigned low_bound = 128 * 1024 * 1024; //128MB is a very small BAR
if (screen->info.driver_props.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY)
if (zink_driverid(screen) == VK_DRIVER_ID_NVIDIA_PROPRIETARY)
low_bound *= 2; //nvidia has fat textures or something
unsigned vk_heap_idx = screen->info.mem_props.memoryTypes[mem_type_idx].heapIndex;
reclaim_all = screen->info.mem_props.memoryHeaps[vk_heap_idx].size <= low_bound;
src/gallium/drivers/zink/zink_compiler.c
+4 -4
View File
@@ -1401,7 +1401,7 @@ zink_screen_init_compiler(struct zink_screen *screen)
if (screen->driver_workarounds.io_opt) {
screen->nir_options.io_options |= nir_io_glsl_opt_varyings;
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_MESA_RADV:
case VK_DRIVER_ID_AMD_OPEN_SOURCE:
case VK_DRIVER_ID_AMD_PROPRIETARY:
@@ -1425,9 +1425,9 @@ zink_screen_init_compiler(struct zink_screen *screen)
-Table 84. Precision of core SPIR-V Instructions
* for drivers that are known to have imprecise fmod for doubles, lower dmod
*/
if (screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_RADV ||
screen->info.driver_props.driverID == VK_DRIVER_ID_AMD_OPEN_SOURCE ||
screen->info.driver_props.driverID == VK_DRIVER_ID_AMD_PROPRIETARY)
if (zink_driverid(screen) == VK_DRIVER_ID_MESA_RADV ||
zink_driverid(screen) == VK_DRIVER_ID_AMD_OPEN_SOURCE ||
zink_driverid(screen) == VK_DRIVER_ID_AMD_PROPRIETARY)
screen->nir_options.lower_doubles_options = nir_lower_dmod;
if (screen->info.have_EXT_shader_demote_to_helper_invocation)
src/gallium/drivers/zink/zink_context.c
+1 -1
View File
@@ -515,7 +515,7 @@ zink_create_sampler_state(struct pipe_context *pctx,
sci.borderColor = get_border_color(&state->border_color, is_integer, need_custom);
if (sci.borderColor > VK_BORDER_COLOR_INT_OPAQUE_WHITE && need_custom) {
if (!screen->info.border_color_feats.customBorderColorWithoutFormat &&
screen->info.driver_props.driverID != VK_DRIVER_ID_MESA_TURNIP) {
zink_driverid(screen) != VK_DRIVER_ID_MESA_TURNIP) {
static bool warned = false;
warn_missing_feature(warned, "customBorderColorWithoutFormat");
}
src/gallium/drivers/zink/zink_screen.c
+29 -29
View File
@@ -158,13 +158,13 @@ static const char *
zink_get_name(struct pipe_screen *pscreen)
{
struct zink_screen *screen = zink_screen(pscreen);
const char *driver_name = vk_DriverId_to_str(screen->info.driver_props.driverID) + strlen("VK_DRIVER_ID_");
const char *driver_name = vk_DriverId_to_str(zink_driverid(screen)) + strlen("VK_DRIVER_ID_");
static char buf[1000];
snprintf(buf, sizeof(buf), "zink Vulkan %d.%d(%s (%s))",
VK_VERSION_MAJOR(screen->info.device_version),
VK_VERSION_MINOR(screen->info.device_version),
screen->info.props.deviceName,
strstr(vk_DriverId_to_str(screen->info.driver_props.driverID), "VK_DRIVER_ID_") ? driver_name : "Driver Unknown"
strstr(vk_DriverId_to_str(zink_driverid(screen)), "VK_DRIVER_ID_") ? driver_name : "Driver Unknown"
);
return buf;
}
@@ -1156,9 +1156,9 @@ zink_get_shader_param(struct pipe_screen *pscreen,
/* intel drivers report fewer components, but it's a value that's compatible
* with what we need for GL, so we can still force a conformant value here
*/
if (screen->info.driver_props.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA ||
screen->info.driver_props.driverID == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS ||
(screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_VENUS
if (zink_driverid(screen) == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA ||
zink_driverid(screen) == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS ||
(zink_driverid(screen) == VK_DRIVER_ID_MESA_VENUS
&& screen->info.props.vendorID == 0x8086))
return 32;
max = screen->info.props.limits.maxFragmentInputComponents / 4;
@@ -2758,7 +2758,7 @@ check_base_requirements(struct zink_screen *screen)
{
if (zink_debug & ZINK_DEBUG_QUIET)
return;
if (screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_V3DV) {
if (zink_driverid(screen) == VK_DRIVER_ID_MESA_V3DV) {
/* v3dv doesn't support straddling i/o, but zink doesn't do that so this is effectively supported:
* don't spam errors in this case
*/
@@ -2789,7 +2789,7 @@ check_base_requirements(struct zink_screen *screen)
CHECK_OR_PRINT(have_EXT_line_rasterization);
fprintf(stderr, "\n");
}
if (screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_V3DV) {
if (zink_driverid(screen) == VK_DRIVER_ID_MESA_V3DV) {
screen->info.feats12.scalarBlockLayout = false;
screen->info.have_EXT_scalar_block_layout = false;
}
@@ -2811,7 +2811,7 @@ init_driver_workarounds(struct zink_screen *screen)
{
/* enable implicit sync for all non-mesa drivers */
screen->driver_workarounds.implicit_sync = true;
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_MESA_RADV:
case VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA:
case VK_DRIVER_ID_MESA_LLVMPIPE:
@@ -2834,7 +2834,7 @@ init_driver_workarounds(struct zink_screen *screen)
/* CWE usage needs EDS1 */
screen->info.have_EXT_color_write_enable = false;
}
if (screen->info.driver_props.driverID == VK_DRIVER_ID_AMD_PROPRIETARY)
if (zink_driverid(screen) == VK_DRIVER_ID_AMD_PROPRIETARY)
/* this completely breaks xfb somehow */
screen->info.have_EXT_extended_dynamic_state2 = false;
/* EDS3 is only used with EDS2 */
@@ -2876,8 +2876,8 @@ init_driver_workarounds(struct zink_screen *screen)
(!(zink_debug & ZINK_DEBUG_GPL) ||
screen->info.gpl_props.graphicsPipelineLibraryFastLinking ||
screen->is_cpu);
screen->driver_workarounds.broken_l4a4 = screen->info.driver_props.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY;
if (screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_TURNIP) {
screen->driver_workarounds.broken_l4a4 = zink_driverid(screen) == VK_DRIVER_ID_NVIDIA_PROPRIETARY;
if (zink_driverid(screen) == VK_DRIVER_ID_MESA_TURNIP) {
/* performance */
screen->info.border_color_feats.customBorderColorWithoutFormat = VK_FALSE;
}
@@ -2895,7 +2895,7 @@ init_driver_workarounds(struct zink_screen *screen)
screen->driver_workarounds.no_linestipple = true;
}
if (screen->info.driver_props.driverID ==
if (zink_driverid(screen) ==
VK_DRIVER_ID_IMAGINATION_PROPRIETARY) {
assert(screen->info.feats.features.geometryShader);
screen->driver_workarounds.no_linesmooth = true;
@@ -2905,7 +2905,7 @@ init_driver_workarounds(struct zink_screen *screen)
* gl_PointSize + glPolygonMode(..., GL_LINE), in the imagination
* proprietary driver.
*/
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_IMAGINATION_PROPRIETARY:
screen->driver_workarounds.no_hw_gl_point = true;
break;
@@ -2914,19 +2914,19 @@ init_driver_workarounds(struct zink_screen *screen)
break;
}
if (screen->info.driver_props.driverID == VK_DRIVER_ID_AMD_OPEN_SOURCE ||
screen->info.driver_props.driverID == VK_DRIVER_ID_AMD_PROPRIETARY ||
screen->info.driver_props.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY ||
screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_RADV)
if (zink_driverid(screen) == VK_DRIVER_ID_AMD_OPEN_SOURCE ||
zink_driverid(screen) == VK_DRIVER_ID_AMD_PROPRIETARY ||
zink_driverid(screen) == VK_DRIVER_ID_NVIDIA_PROPRIETARY ||
zink_driverid(screen) == VK_DRIVER_ID_MESA_RADV)
screen->driver_workarounds.z24_unscaled_bias = 1<<23;
else
screen->driver_workarounds.z24_unscaled_bias = 1<<24;
if (screen->info.driver_props.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY)
if (zink_driverid(screen) == VK_DRIVER_ID_NVIDIA_PROPRIETARY)
screen->driver_workarounds.z16_unscaled_bias = 1<<15;
else
screen->driver_workarounds.z16_unscaled_bias = 1<<16;
/* these drivers don't use VK_PIPELINE_CREATE_COLOR_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT, so it can always be set */
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_MESA_RADV:
case VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA:
case VK_DRIVER_ID_MESA_LLVMPIPE:
@@ -2940,7 +2940,7 @@ init_driver_workarounds(struct zink_screen *screen)
break;
}
/* these drivers don't use VK_PIPELINE_CREATE_DEPTH_STENCIL_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT, so it can always be set */
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_MESA_LLVMPIPE:
case VK_DRIVER_ID_MESA_VENUS:
case VK_DRIVER_ID_NVIDIA_PROPRIETARY:
@@ -2957,7 +2957,7 @@ init_driver_workarounds(struct zink_screen *screen)
/* these drivers cannot handle OOB gl_Layer values, and therefore need clamping in shader.
* TODO: Vulkan extension that details whether vulkan driver can handle OOB layer values
*/
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_IMAGINATION_PROPRIETARY:
screen->driver_workarounds.needs_sanitised_layer = true;
break;
@@ -2968,7 +2968,7 @@ init_driver_workarounds(struct zink_screen *screen)
/* these drivers will produce undefined results when using swizzle 1 with combined z/s textures
* TODO: use a future device property when available
*/
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_IMAGINATION_PROPRIETARY:
case VK_DRIVER_ID_IMAGINATION_OPEN_SOURCE_MESA:
screen->driver_workarounds.needs_zs_shader_swizzle = true;
@@ -2992,7 +2992,7 @@ init_driver_workarounds(struct zink_screen *screen)
}
/* these drivers benefit from renderpass optimization */
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_MESA_LLVMPIPE:
case VK_DRIVER_ID_MESA_TURNIP:
case VK_DRIVER_ID_MESA_PANVK:
@@ -3013,7 +3013,7 @@ init_driver_workarounds(struct zink_screen *screen)
screen->driver_workarounds.track_renderpasses = false;
/* these drivers can successfully do INVALID <-> LINEAR dri3 modifier swap */
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_MESA_TURNIP:
case VK_DRIVER_ID_MESA_VENUS:
case VK_DRIVER_ID_MESA_NVK:
@@ -3024,7 +3024,7 @@ init_driver_workarounds(struct zink_screen *screen)
}
/* these drivers have no difference between unoptimized and optimized shader compilation */
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_MESA_LLVMPIPE:
screen->driver_workarounds.disable_optimized_compile = true;
break;
@@ -3034,7 +3034,7 @@ init_driver_workarounds(struct zink_screen *screen)
break;
}
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_MESA_RADV:
case VK_DRIVER_ID_AMD_OPEN_SOURCE:
case VK_DRIVER_ID_AMD_PROPRIETARY:
@@ -3048,7 +3048,7 @@ init_driver_workarounds(struct zink_screen *screen)
}
screen->driver_workarounds.can_2d_view_sparse = true;
switch (screen->info.driver_props.driverID) {
switch (zink_driverid(screen)) {
case VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA:
case VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS:
/* this does wild things to block shapes */
@@ -3092,7 +3092,7 @@ static void
init_optimal_keys(struct zink_screen *screen)
{
/* assume that anyone who knows enough to enable optimal_keys on turnip doesn't care about missing line stipple */
if (zink_debug & ZINK_DEBUG_OPTIMAL_KEYS && screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_TURNIP)
if (zink_debug & ZINK_DEBUG_OPTIMAL_KEYS && zink_driverid(screen) == VK_DRIVER_ID_MESA_TURNIP)
zink_debug |= ZINK_DEBUG_QUIET;
screen->optimal_keys = !screen->need_decompose_attrs &&
screen->info.have_EXT_non_seamless_cube_map &&
@@ -3610,7 +3610,7 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev
}
if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_AUTO) {
/* descriptor buffer is not performant with virt yet */
if (screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_VENUS)
if (zink_driverid(screen) == VK_DRIVER_ID_MESA_VENUS)
zink_descriptor_mode = ZINK_DESCRIPTOR_MODE_LAZY;
else
zink_descriptor_mode = can_db ? ZINK_DESCRIPTOR_MODE_DB : ZINK_DESCRIPTOR_MODE_LAZY;
src/gallium/drivers/zink/zink_screen.h
+6
View File
@@ -130,6 +130,12 @@ zink_string_vkflags_unroll(char *buf, size_t bufsize, uint64_t flags, zink_vkfla
VkSemaphore
zink_create_semaphore(struct zink_screen *screen);
static inline VkDriverId
zink_driverid(const struct zink_screen *screen)
{
return screen->info.driver_props.driverID;
}
void
zink_screen_lock_context(struct zink_screen *screen);
void