diff options
| -rw-r--r-- | lib/mesa/src/freedreno/ir3/ir3_compiler_nir.c | 5 | ||||
| -rw-r--r-- | lib/mesa/src/intel/vulkan/meson.build | 36 |
2 files changed, 24 insertions, 17 deletions
diff --git a/lib/mesa/src/freedreno/ir3/ir3_compiler_nir.c b/lib/mesa/src/freedreno/ir3/ir3_compiler_nir.c index fd6417356..fc882c2d2 100644 --- a/lib/mesa/src/freedreno/ir3/ir3_compiler_nir.c +++ b/lib/mesa/src/freedreno/ir3/ir3_compiler_nir.c @@ -686,8 +686,8 @@ emit_intrinsic_load_ubo(struct ir3_context *ctx, nir_intrinsic_instr *intr, base_lo = create_uniform(b, ubo + (src0->regs[1]->iim_val * ptrsz)); base_hi = create_uniform(b, ubo + (src0->regs[1]->iim_val * ptrsz) + 1); } else { - base_lo = create_uniform_indirect(b, ubo, ir3_get_addr(ctx, src0, 4)); - base_hi = create_uniform_indirect(b, ubo + 1, ir3_get_addr(ctx, src0, 4)); + base_lo = create_uniform_indirect(b, ubo, ir3_get_addr(ctx, src0, ptrsz)); + base_hi = create_uniform_indirect(b, ubo + 1, ir3_get_addr(ctx, src0, ptrsz)); } /* note: on 32bit gpu's base_hi is ignored and DCE'd */ @@ -1511,6 +1511,7 @@ emit_intrinsic_barrier(struct ir3_context *ctx, nir_intrinsic_instr *intr) barrier->cat7.g = true; barrier->cat7.r = true; barrier->cat7.w = true; + barrier->cat7.l = true; barrier->barrier_class = IR3_BARRIER_IMAGE_W | IR3_BARRIER_BUFFER_W; barrier->barrier_conflict = diff --git a/lib/mesa/src/intel/vulkan/meson.build b/lib/mesa/src/intel/vulkan/meson.build index af1223ad3..83313e15c 100644 --- a/lib/mesa/src/intel/vulkan/meson.build +++ b/lib/mesa/src/intel/vulkan/meson.build @@ -98,20 +98,20 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']], 'anv_gen@0@'.format(_gen), [anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h], include_directories : [ - inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util, - inc_vulkan_wsi, + inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_wsi, ], c_args : [ c_vis_args, no_override_init_args, c_sse2_args, '-DGEN_VERSIONx10=@0@'.format(_gen), ], - dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml], + dependencies : [ + dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml, idep_vulkan_util_headers, + ], ) endforeach libanv_files = files( 'anv_allocator.c', - 'anv_android_stubs.c', 'anv_android.h', 'anv_batch_chain.c', 'anv_blorp.c', @@ -144,6 +144,7 @@ anv_deps = [ dep_libdrm, dep_valgrind, idep_nir_headers, + idep_vulkan_util_headers, ] anv_flags = [ c_vis_args, @@ -176,6 +177,13 @@ if with_xlib_lease anv_flags += '-DVK_USE_PLATFORM_XLIB_XRANDR_EXT' endif +if with_platform_android + anv_flags += '-DVK_USE_PLATFORM_ANDROID_KHR' + libanv_files += files('anv_android.c') +else + libanv_files += files('anv_android_stubs.c') +endif + libanv_common = static_library( 'anv_common', [ @@ -183,7 +191,7 @@ libanv_common = static_library( gen_xml_pack, ], include_directories : [ - inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util, + inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_wsi, ], c_args : anv_flags, @@ -194,16 +202,15 @@ libvulkan_intel = shared_library( 'vulkan_intel', [files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h], include_directories : [ - inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util, - inc_vulkan_wsi, + inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_wsi, ], link_whole : [libanv_common, libanv_gen_libs], link_with : [ libintel_compiler, libintel_common, libintel_dev, libisl, libblorp, - libvulkan_util, libvulkan_wsi, libmesa_util, + libvulkan_wsi, libmesa_util, ], dependencies : [ - dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_genxml, + dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_genxml, idep_vulkan_util ], c_args : anv_flags, link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections], @@ -215,16 +222,15 @@ if with_tests 'vulkan_intel_test', [files('anv_gem_stubs.c'), anv_entrypoints[0], anv_extensions_h], include_directories : [ - inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util, - inc_vulkan_wsi, + inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_wsi, ], link_whole : libanv_common, link_with : [ libanv_gen_libs, libintel_compiler, libintel_common, libintel_dev, - libisl, libblorp, libvulkan_util, libvulkan_wsi, libmesa_util, + libisl, libblorp, libvulkan_wsi, libmesa_util, ], dependencies : [ - dep_thread, dep_dl, dep_m, anv_deps, idep_nir, + dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_vulkan_util ], c_args : anv_flags, ) @@ -239,9 +245,9 @@ if with_tests ['tests/@0@.c'.format(t), anv_entrypoints[0], anv_extensions_h], c_args : [ c_sse2_args ], link_with : libvulkan_intel_test, - dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind], + dependencies : [dep_libdrm, dep_thread, dep_m, dep_valgrind, idep_vulkan_util, ], include_directories : [ - inc_common, inc_intel, inc_compiler, inc_vulkan_util, inc_vulkan_wsi, + inc_common, inc_intel, inc_compiler, inc_vulkan_wsi, ], ), suite : ['intel'], |