diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-07-01 08:05:06 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-07-01 08:05:06 +0000 |
| commit | 191ed0bbe942b47b2078dfb4a202aaed260860b8 (patch) | |
| tree | 1fd373cc4f5c068a9229fefae9520d9ea0ef2483 /lib/mesa/src | |
| parent | 58fd8ddc4c85dfec0c9857f64c30926298cb0635 (diff) | |
Import Mesa 19.0.8
Diffstat (limited to 'lib/mesa/src')
| -rw-r--r-- | lib/mesa/src/amd/vulkan/meson.build | 15 | ||||
| -rw-r--r-- | lib/mesa/src/amd/vulkan/radv_meta_fmask_expand.c | 3 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lib/mesa/src/amd/vulkan/meson.build b/lib/mesa/src/amd/vulkan/meson.build index 06c33ca45..fe3ce3f36 100644 --- a/lib/mesa/src/amd/vulkan/meson.build +++ b/lib/mesa/src/amd/vulkan/meson.build @@ -128,21 +128,26 @@ if with_xlib_lease radv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT' endif +if with_platform_android + radv_flags += [ + '-DVK_USE_PLATFORM_ANDROID_KHR' + ] + libradv_files += files('radv_android.c') +endif + libvulkan_radeon = shared_library( 'vulkan_radeon', [libradv_files, radv_entrypoints, radv_extensions_c, vk_format_table_c, sha1_h], include_directories : [ - inc_common, inc_amd, inc_amd_common, inc_compiler, inc_vulkan_util, - inc_vulkan_wsi, + inc_common, inc_amd, inc_amd_common, inc_compiler, inc_vulkan_wsi, ], link_with : [ - libamd_common, libamdgpu_addrlib, libvulkan_util, libvulkan_wsi, - libmesa_util, + libamd_common, libamdgpu_addrlib, libvulkan_wsi, libmesa_util, ], dependencies : [ dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m, dep_valgrind, radv_deps, - idep_nir, + idep_nir, idep_vulkan_util, ], c_args : [c_vis_args, no_override_init_args, radv_flags], cpp_args : [cpp_vis_args, radv_flags], diff --git a/lib/mesa/src/amd/vulkan/radv_meta_fmask_expand.c b/lib/mesa/src/amd/vulkan/radv_meta_fmask_expand.c index f4b553289..425f473fe 100644 --- a/lib/mesa/src/amd/vulkan/radv_meta_fmask_expand.c +++ b/lib/mesa/src/amd/vulkan/radv_meta_fmask_expand.c @@ -24,6 +24,7 @@ #include "radv_meta.h" #include "radv_private.h" +#include "vk_format.h" static nir_shader * build_fmask_expand_compute_shader(struct radv_device *device, int samples) @@ -132,7 +133,7 @@ radv_expand_fmask_image_inplace(struct radv_cmd_buffer *cmd_buffer, .sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO, .image = radv_image_to_handle(image), .viewType = radv_meta_get_view_type(image), - .format = image->vk_format, + .format = vk_format_no_srgb(image->vk_format), .subresourceRange = { .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0, |