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

lavapipe: implement VK_EXT_custom_border_color 

This fixes a bunch of piglit failures on Zink.

Reviewed-by: Joshua Ashton <joshua@froggi.es>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10320>
This commit is contained in:
Erik Faye-Lund 2021-04-19 13:30:22 +02:00 committed by Marge Bot
parent a20e0b8a97
commit bd1b0c3266
2 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt
View File

@ -53,23 +53,13 @@ spec@!opengl 1.1@read-front clear-front-first samples=2,Fail
spec@!opengl 1.1@read-front clear-front-first samples=4,Fail
spec@!opengl 1.1@read-front samples=2,Fail
spec@!opengl 1.1@read-front samples=4,Fail
spec@!opengl 1.1@texwrap 1d bordercolor,Fail
spec@!opengl 1.1@texwrap 1d proj bordercolor,Fail
spec@!opengl 1.1@texwrap 2d bordercolor,Fail
spec@!opengl 1.1@texwrap 2d proj bordercolor,Fail
spec@!opengl 1.1@texwrap formats bordercolor,Fail
spec@!opengl 1.1@texwrap formats bordercolor-swizzled,Fail
spec@!opengl 1.2@copyteximage 3d,Fail
spec@!opengl 1.2@texwrap 3d bordercolor,Fail
spec@!opengl 1.2@texwrap 3d proj bordercolor,Fail
spec@!opengl 1.3@gl-1.3-texture-env,Fail
spec@!opengl 1.3@tex-border-1,Fail
spec@!opengl 1.3@tex3d-depth1,Fail
spec@!opengl 1.4@gl-1.4-polygon-offset,Fail
spec@!opengl 2.0@depth-tex-modes-glsl,Fail
spec@!opengl 2.0@gl-2.0-edgeflag,Fail
spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail
spec@!opengl 2.0@max-samplers border,Fail
spec@!opengl 2.1@pbo,Fail
spec@!opengl 2.1@polygon-stipple-fs,Fail
spec@!opengl 3.0@sampler-cube-shadow,Fail
@ -85,12 +75,7 @@ spec@!opengl 3.2@gl-3.2-adj-prims pv-first,Fail
spec@!opengl 3.2@gl-3.2-adj-prims pv-last,Fail
spec@!opengl es 2.0@glsl-fs-pointcoord,Fail
spec@!opengl es 3.0@gles-3.0-transform-feedback-uniform-buffer-object,Fail
spec@arb_depth_buffer_float@texwrap formats bordercolor,Fail
spec@arb_depth_buffer_float@texwrap formats bordercolor-swizzled,Fail
spec@arb_depth_texture@depth-tex-modes,Fail
spec@arb_depth_texture@texwrap formats bordercolor,Fail
spec@arb_depth_texture@texwrap formats bordercolor-swizzled,Fail
spec@arb_es2_compatibility@texwrap formats bordercolor,Fail
spec@arb_es2_compatibility@texwrap formats bordercolor-swizzled,Fail
spec@arb_fragment_program@fp-abs-01,Crash
spec@arb_framebuffer_object@fbo-blit-scaled-linear,Fail
@ -119,27 +104,16 @@ spec@arb_tessellation_shader@arb_tessellation_shader-tes-gs-max-output -small -s
spec@arb_texture_buffer_object@indexed,Fail
spec@arb_texture_buffer_object@render-no-bo,Crash
spec@arb_texture_buffer_range@ranges-2 compat,Fail
spec@arb_texture_compression@texwrap formats bordercolor,Fail
spec@arb_texture_compression@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_compression_bptc@texwrap formats bordercolor,Fail
spec@arb_texture_compression_bptc@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_cube_map_array@arb_texture_cube_map_array-sampler-cube-array-shadow,Fail
spec@arb_texture_float@fbo-blending-formats,Fail
spec@arb_texture_float@texwrap formats bordercolor,Fail
spec@arb_texture_float@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_rectangle@texwrap rect bordercolor,Fail
spec@arb_texture_rectangle@texwrap rect proj bordercolor,Fail
spec@arb_texture_rg@multisample-fast-clear gl_arb_texture_rg-int,Fail
spec@arb_texture_rg@texwrap formats bordercolor,Fail
spec@arb_texture_rg@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_rg@texwrap formats-float bordercolor,Fail
spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled,Fail
spec@arb_texture_rg@texwrap formats-int bordercolor,Fail
spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled,Fail
spec@arb_texture_rgb10_a2ui@texwrap formats bordercolor,Fail
spec@arb_texture_rgb10_a2ui@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_stencil8@texwrap formats bordercolor,Fail
spec@arb_texture_stencil8@texwrap formats bordercolor-swizzled,Fail
spec@arb_texture_view@rendering-formats,Fail
spec@arb_texture_view@sampling-2d-array-as-cubemap-array,Fail
spec@arb_uniform_buffer_object@maxblocks,Crash
@ -191,27 +165,17 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,Fail
spec@ext_image_dma_buf_import@ext_image_dma_buf_import-unsupported_format,Fail
spec@ext_packed_depth_stencil@texwrap formats bordercolor,Fail
spec@ext_packed_depth_stencil@texwrap formats bordercolor-swizzled,Fail
spec@ext_packed_float@query-rgba-signed-components,Fail
spec@ext_packed_float@texwrap formats bordercolor,Fail
spec@ext_packed_float@texwrap formats bordercolor-swizzled,Fail
spec@ext_provoking_vertex@provoking-vertex,Fail
spec@ext_texture_compression_rgtc@texwrap formats bordercolor,Fail
spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled,Fail
spec@ext_texture_compression_s3tc@texwrap formats bordercolor,Fail
spec@ext_texture_compression_s3tc@texwrap formats bordercolor-swizzled,Fail
spec@ext_texture_integer@multisample-fast-clear gl_ext_texture_integer,Fail
spec@ext_texture_integer@texwrap formats bordercolor,Fail
spec@ext_texture_integer@texwrap formats bordercolor-swizzled,Fail
spec@ext_texture_shared_exponent@texwrap formats bordercolor,Fail
spec@ext_texture_shared_exponent@texwrap formats bordercolor-swizzled,Fail
spec@ext_texture_snorm@fbo-blending-formats,Fail
spec@ext_texture_snorm@texwrap formats bordercolor,Fail
spec@ext_texture_snorm@texwrap formats bordercolor-swizzled,Fail
spec@ext_texture_srgb@texwrap formats bordercolor,Fail
spec@ext_texture_srgb@texwrap formats bordercolor-swizzled,Fail
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor,Fail
spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled,Fail
spec@ext_texture_swizzle@depth_texture_mode_and_swizzle,Fail
spec@ext_transform_feedback2@counting with pause,Fail

25
src/gallium/frontends/lavapipe/lvp_device.c
View File

@ -136,6 +136,7 @@ static const struct vk_device_extension_table lvp_device_extensions_supported =
.EXT_shader_viewport_index_layer = true,
.EXT_transform_feedback = true,
.EXT_vertex_attribute_divisor = true,
.EXT_custom_border_color = true,
.GOOGLE_decorate_string = true,
.GOOGLE_hlsl_functionality1 = true,
};
@ -628,6 +629,14 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures2(
features->imagelessFramebuffer = true;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT: {
VkPhysicalDeviceCustomBorderColorFeaturesEXT *features =
(VkPhysicalDeviceCustomBorderColorFeaturesEXT *)ext;
features->customBorderColors = true;
features->customBorderColorWithoutFormat = true;
break;
}
default:
break;
}
@ -939,6 +948,12 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceProperties2(
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_PROPERTIES:
lvp_get_physical_device_properties_1_1(pdevice, (void *)ext);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_PROPERTIES_EXT: {
VkPhysicalDeviceCustomBorderColorPropertiesEXT *properties =
(VkPhysicalDeviceCustomBorderColorPropertiesEXT *)ext;
properties->maxCustomBorderColorSamplers = 32 * 1024;
break;
}
default:
break;
}
@ -1917,6 +1932,9 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateSampler(
const VkSamplerReductionModeCreateInfo *reduction_mode_create_info =
vk_find_struct_const(pCreateInfo->pNext,
SAMPLER_REDUCTION_MODE_CREATE_INFO);
const VkSamplerCustomBorderColorCreateInfoEXT *custom_border_color_create_info =
vk_find_struct_const(pCreateInfo->pNext,
SAMPLER_CUSTOM_BORDER_COLOR_CREATE_INFO_EXT);
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO);
@ -1955,6 +1973,13 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateSampler(
sampler->border_color.i[2] = 1;
sampler->border_color.i[3] = 1;
break;
case VK_BORDER_COLOR_FLOAT_CUSTOM_EXT:
case VK_BORDER_COLOR_INT_CUSTOM_EXT:
assert(custom_border_color_create_info != NULL);
memcpy(&sampler->border_color,
&custom_border_color_create_info->customBorderColor,
sizeof(union pipe_color_union));
break;
}
sampler->reduction_mode = VK_SAMPLER_REDUCTION_MODE_WEIGHTED_AVERAGE;