NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

zink: Removes disable_xcb_surface

Browse source 
This dri config is no longer necessary since the case where it was
required is being handled in the previous commit.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Igor Torrente <igor.torrente@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24222>
This commit is contained in:
Igor Torrente 2023-07-19 09:48:04 -03:00 • committed by Marge Bot
parent 6d60115be7
commit 388bf84c07
4 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/zink/driinfo_zink.h
View file

@ -3,8 +3,6 @@
DRI_CONF_SECTION_DEBUG
DRI_CONF_DUAL_COLOR_BLEND_BY_LOCATION(false)
DRI_CONF_OPT_B(radeonsi_inline_uniforms, false, "Optimize shaders by replacing uniforms with literals")
DRI_CONF_OPT_B(disable_xcb_surface, false, \
"disable ext")
DRI_CONF_SECTION_END
DRI_CONF_SECTION_PERFORMANCE

3
src/gallium/drivers/zink/zink_instance.py
View file

@ -46,7 +46,7 @@ EXTENSIONS = [
Extension("VK_KHR_wayland_surface",
conditions=["!display_dev"]),
Extension("VK_KHR_xcb_surface",
conditions=["!instance_info->disable_xcb_surface && !display_dev"]),
conditions=["!display_dev"]),
Extension("VK_KHR_win32_surface"),
]
@ -82,7 +82,6 @@ struct zink_screen;
struct zink_instance_info {
uint32_t loader_version;
bool disable_xcb_surface;
%for ext in extensions:
bool have_${ext.name_with_vendor()};

1
src/gallium/drivers/zink/zink_screen.c
View file

@ -2877,7 +2877,6 @@ zink_internal_create_screen(const struct pipe_screen_config *config)
//screen->driconf.inline_uniforms = driQueryOptionb(config->options, "radeonsi_inline_uniforms");
screen->driconf.emulate_point_smooth = driQueryOptionb(config->options, "zink_emulate_point_smooth");
screen->driconf.zink_shader_object_enable = driQueryOptionb(config->options, "zink_shader_object_enable");
screen->instance_info.disable_xcb_surface = driQueryOptionb(config->options, "disable_xcb_surface");
}
if (!zink_create_instance(screen, config->dev_major > 0 && config->dev_major < 255))

5
src/util/00-mesa-defaults.conf
View file

@ -74,11 +74,6 @@ TODO: document the other workarounds.
<option name="disable_arb_gpu_shader5" value="true" />
</application>
<!-- using vulkan wsi for xservers causes deadlocks -->
<application name="Xwayland" executable="Xwayland">
<option name="disable_xcb_surface" value="true" />
</application>
<application name="Unigine Heaven (32-bit)" executable="heaven_x86">
<option name="allow_glsl_extension_directive_midshader" value="true" />
<!-- remove dual_color_blend_by_location if 4.1 ever comes out -->