Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vulkan-tools for openSUSE:Factory checked in at 2024-05-17 20:04:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-tools (Old) and /work/SRC/openSUSE:Factory/.vulkan-tools.new.1880 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan-tools" Fri May 17 20:04:18 2024 rev:49 rq:1174492 version:1.3.283.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-tools/vulkan-tools.changes 2024-03-26 19:24:25.266665850 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-tools.new.1880/vulkan-tools.changes 2024-05-17 20:05:23.395874778 +0200 @@ -1,0 +2,7 @@ +Thu May 16 12:21:39 UTC 2024 - Jan Engelhardt <[email protected]> + +- Update to release SDK-1.3.283.0 + * vulkaninfo: Add minImageCount/maxImageCount to + VK_EXT_surface_maintenance1 information + +------------------------------------------------------------------- Old: ---- vulkan-sdk-1.3.280.0.tar.gz New: ---- vulkan-sdk-1.3.283.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-tools.spec ++++++ --- /var/tmp/diff_new_pack.4IwhDR/_old 2024-05-17 20:05:24.139901663 +0200 +++ /var/tmp/diff_new_pack.4IwhDR/_new 2024-05-17 20:05:24.143901807 +0200 @@ -17,7 +17,7 @@ Name: vulkan-tools -Version: 1.3.280.0 +Version: 1.3.283.0 Release: 0 Summary: Diagnostic utilities for Vulkan License: Apache-2.0 @@ -30,8 +30,8 @@ BuildRequires: glslang-devel BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: vulkan-volk-devel >= 1.3.280 -BuildRequires: pkgconfig(vulkan) >= 1.3.280 +BuildRequires: vulkan-volk-devel >= 1.3.283 +BuildRequires: pkgconfig(vulkan) >= 1.3.283 BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) ++++++ vulkan-sdk-1.3.280.0.tar.gz -> vulkan-sdk-1.3.283.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/.github/workflows/tools.yml new/Vulkan-Tools-vulkan-sdk-1.3.283.0/.github/workflows/tools.yml --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/.github/workflows/tools.yml 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/.github/workflows/tools.yml 2024-05-06 21:20:39.000000000 +0200 @@ -146,7 +146,7 @@ - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.7' + python-version: '3.8' - uses: lukka/get-cmake@latest - name: Setup ccache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/CMakeLists.txt new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/CMakeLists.txt --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/CMakeLists.txt 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/CMakeLists.txt 2024-05-06 21:20:39.000000000 +0200 @@ -21,7 +21,6 @@ ) target_include_directories(vkcube PRIVATE - include . ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/include/cube.frag.h new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/include/cube.frag.h --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/include/cube.frag.h 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/include/cube.frag.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -#include <stdint.h> - -#if 0 -../cube.frag -Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - - -Linked fragment stage: - - -// Module Version 10000 -// Generated by (magic number): 80001 -// Id's are bound by 21 - - Capability Shader - 1: ExtInstImport "GLSL.std.450" - MemoryModel Logical GLSL450 - EntryPoint Fragment 4 "main" 9 16 - ExecutionMode 4 OriginUpperLeft - Source GLSL 400 - SourceExtension "GL_ARB_separate_shader_objects" - SourceExtension "GL_ARB_shading_language_420pack" - Name 4 "main" - Name 9 "uFragColor" - Name 13 "tex" - Name 16 "texcoord" - Decorate 9(uFragColor) Location 0 - Decorate 13(tex) DescriptorSet 0 - Decorate 13(tex) Binding 1 - Decorate 16(texcoord) Location 0 - 2: TypeVoid - 3: TypeFunction 2 - 6: TypeFloat 32 - 7: TypeVector 6(float) 4 - 8: TypePointer Output 7(fvec4) - 9(uFragColor): 8(ptr) Variable Output - 10: TypeImage 6(float) 2D sampled format:Unknown - 11: TypeSampledImage 10 - 12: TypePointer UniformConstant 11 - 13(tex): 12(ptr) Variable UniformConstant - 15: TypePointer Input 7(fvec4) - 16(texcoord): 15(ptr) Variable Input - 17: TypeVector 6(float) 2 - 4(main): 2 Function None 3 - 5: Label - 14: 11 Load 13(tex) - 18: 7(fvec4) Load 16(texcoord) - 19: 17(fvec2) VectorShuffle 18 18 0 1 - 20: 7(fvec4) ImageSampleImplicitLod 14 19 - Store 9(uFragColor) 20 - Return - FunctionEnd -#endif - -static const uint32_t cube_frag[164] = { - 0x07230203, 0x00010000, 0x00080001, 0x00000015, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, - 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0007000f, 0x00000004, 0x00000004, 0x6e69616d, - 0x00000000, 0x00000009, 0x00000010, 0x00030010, 0x00000004, 0x00000007, 0x00030003, 0x00000002, 0x00000190, 0x00090004, - 0x415f4c47, 0x735f4252, 0x72617065, 0x5f657461, 0x64616873, 0x6f5f7265, 0x63656a62, 0x00007374, 0x00090004, 0x415f4c47, - 0x735f4252, 0x69646168, 0x6c5f676e, 0x75676e61, 0x5f656761, 0x70303234, 0x006b6361, 0x00040005, 0x00000004, 0x6e69616d, - 0x00000000, 0x00050005, 0x00000009, 0x61724675, 0x6c6f4367, 0x0000726f, 0x00030005, 0x0000000d, 0x00786574, 0x00050005, - 0x00000010, 0x63786574, 0x64726f6f, 0x00000000, 0x00040047, 0x00000009, 0x0000001e, 0x00000000, 0x00040047, 0x0000000d, - 0x00000022, 0x00000000, 0x00040047, 0x0000000d, 0x00000021, 0x00000001, 0x00040047, 0x00000010, 0x0000001e, 0x00000000, - 0x00020013, 0x00000002, 0x00030021, 0x00000003, 0x00000002, 0x00030016, 0x00000006, 0x00000020, 0x00040017, 0x00000007, - 0x00000006, 0x00000004, 0x00040020, 0x00000008, 0x00000003, 0x00000007, 0x0004003b, 0x00000008, 0x00000009, 0x00000003, - 0x00090019, 0x0000000a, 0x00000006, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0003001b, - 0x0000000b, 0x0000000a, 0x00040020, 0x0000000c, 0x00000000, 0x0000000b, 0x0004003b, 0x0000000c, 0x0000000d, 0x00000000, - 0x00040020, 0x0000000f, 0x00000001, 0x00000007, 0x0004003b, 0x0000000f, 0x00000010, 0x00000001, 0x00040017, 0x00000011, - 0x00000006, 0x00000002, 0x00050036, 0x00000002, 0x00000004, 0x00000000, 0x00000003, 0x000200f8, 0x00000005, 0x0004003d, - 0x0000000b, 0x0000000e, 0x0000000d, 0x0004003d, 0x00000007, 0x00000012, 0x00000010, 0x0007004f, 0x00000011, 0x00000013, - 0x00000012, 0x00000012, 0x00000000, 0x00000001, 0x00050057, 0x00000007, 0x00000014, 0x0000000e, 0x00000013, 0x0003003e, - 0x00000009, 0x00000014, 0x000100fd, 0x00010038, -}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/include/cube.frag.inc new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/include/cube.frag.inc --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/include/cube.frag.inc 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/include/cube.frag.inc 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ - // Overload400-PrecQual.2000 12-Apr-2017 - 0x07230203,0x00010000,0x00080002,0x00000015,0x00000000,0x00020011,0x00000001,0x0006000b, - 0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001, - 0x0007000f,0x00000004,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000010,0x00030010, - 0x00000004,0x00000007,0x00030003,0x00000002,0x00000190,0x00090004,0x415f4c47,0x735f4252, - 0x72617065,0x5f657461,0x64616873,0x6f5f7265,0x63656a62,0x00007374,0x00090004,0x415f4c47, - 0x735f4252,0x69646168,0x6c5f676e,0x75676e61,0x5f656761,0x70303234,0x006b6361,0x00040005, - 0x00000004,0x6e69616d,0x00000000,0x00050005,0x00000009,0x61724675,0x6c6f4367,0x0000726f, - 0x00030005,0x0000000d,0x00786574,0x00050005,0x00000010,0x63786574,0x64726f6f,0x00000000, - 0x00040047,0x00000009,0x0000001e,0x00000000,0x00040047,0x0000000d,0x00000022,0x00000000, - 0x00040047,0x0000000d,0x00000021,0x00000001,0x00040047,0x00000010,0x0000001e,0x00000000, - 0x00020013,0x00000002,0x00030021,0x00000003,0x00000002,0x00030016,0x00000006,0x00000020, - 0x00040017,0x00000007,0x00000006,0x00000004,0x00040020,0x00000008,0x00000003,0x00000007, - 0x0004003b,0x00000008,0x00000009,0x00000003,0x00090019,0x0000000a,0x00000006,0x00000001, - 0x00000000,0x00000000,0x00000000,0x00000001,0x00000000,0x0003001b,0x0000000b,0x0000000a, - 0x00040020,0x0000000c,0x00000000,0x0000000b,0x0004003b,0x0000000c,0x0000000d,0x00000000, - 0x00040020,0x0000000f,0x00000001,0x00000007,0x0004003b,0x0000000f,0x00000010,0x00000001, - 0x00040017,0x00000011,0x00000006,0x00000002,0x00050036,0x00000002,0x00000004,0x00000000, - 0x00000003,0x000200f8,0x00000005,0x0004003d,0x0000000b,0x0000000e,0x0000000d,0x0004003d, - 0x00000007,0x00000012,0x00000010,0x0007004f,0x00000011,0x00000013,0x00000012,0x00000012, - 0x00000000,0x00000001,0x00050057,0x00000007,0x00000014,0x0000000e,0x00000013,0x0003003e, - 0x00000009,0x00000014,0x000100fd,0x00010038 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/include/cube.vert.h new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/include/cube.vert.h --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/include/cube.vert.h 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/include/cube.vert.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,149 +0,0 @@ -#include <stdint.h> - -#if 0 -../cube.vert -Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - - -Linked vertex stage: - - -// Module Version 10000 -// Generated by (magic number): 80001 -// Id's are bound by 55 - - Capability Shader - 1: ExtInstImport "GLSL.std.450" - MemoryModel Logical GLSL450 - EntryPoint Vertex 4 "main" 9 21 28 - Source GLSL 400 - SourceExtension "GL_ARB_separate_shader_objects" - SourceExtension "GL_ARB_shading_language_420pack" - Name 4 "main" - Name 9 "texcoord" - Name 15 "buf" - MemberName 15(buf) 0 "MVP" - MemberName 15(buf) 1 "position" - MemberName 15(buf) 2 "attr" - Name 17 "ubuf" - Name 21 "gl_VertexIndex" - Name 26 "gl_PerVertex" - MemberName 26(gl_PerVertex) 0 "gl_Position" - Name 28 "" - Decorate 9(texcoord) Location 0 - Decorate 13 ArrayStride 16 - Decorate 14 ArrayStride 16 - MemberDecorate 15(buf) 0 ColMajor - MemberDecorate 15(buf) 0 Offset 0 - MemberDecorate 15(buf) 0 MatrixStride 16 - MemberDecorate 15(buf) 1 Offset 64 - MemberDecorate 15(buf) 2 Offset 640 - Decorate 15(buf) Block - Decorate 17(ubuf) DescriptorSet 0 - Decorate 17(ubuf) Binding 0 - Decorate 21(gl_VertexIndex) BuiltIn VertexIndex - MemberDecorate 26(gl_PerVertex) 0 BuiltIn Position - Decorate 26(gl_PerVertex) Block - 2: TypeVoid - 3: TypeFunction 2 - 6: TypeFloat 32 - 7: TypeVector 6(float) 4 - 8: TypePointer Output 7(fvec4) - 9(texcoord): 8(ptr) Variable Output - 10: TypeMatrix 7(fvec4) 4 - 11: TypeInt 32 0 - 12: 11(int) Constant 36 - 13: TypeArray 7(fvec4) 12 - 14: TypeArray 7(fvec4) 12 - 15(buf): TypeStruct 10 13 14 - 16: TypePointer Uniform 15(buf) - 17(ubuf): 16(ptr) Variable Uniform - 18: TypeInt 32 1 - 19: 18(int) Constant 2 - 20: TypePointer Input 18(int) -21(gl_VertexIndex): 20(ptr) Variable Input - 23: TypePointer Uniform 7(fvec4) -26(gl_PerVertex): TypeStruct 7(fvec4) - 27: TypePointer Output 26(gl_PerVertex) - 28: 27(ptr) Variable Output - 29: 18(int) Constant 0 - 30: TypePointer Uniform 10 - 33: 18(int) Constant 1 - 39: 11(int) Constant 1 - 40: TypePointer Output 6(float) - 45: 11(int) Constant 2 - 48: 11(int) Constant 3 - 52: 6(float) Constant 1073741824 - 4(main): 2 Function None 3 - 5: Label - 22: 18(int) Load 21(gl_VertexIndex) - 24: 23(ptr) AccessChain 17(ubuf) 19 22 - 25: 7(fvec4) Load 24 - Store 9(texcoord) 25 - 31: 30(ptr) AccessChain 17(ubuf) 29 - 32: 10 Load 31 - 34: 18(int) Load 21(gl_VertexIndex) - 35: 23(ptr) AccessChain 17(ubuf) 33 34 - 36: 7(fvec4) Load 35 - 37: 7(fvec4) MatrixTimesVector 32 36 - 38: 8(ptr) AccessChain 28 29 - Store 38 37 - 41: 40(ptr) AccessChain 28 29 39 - 42: 6(float) Load 41 - 43: 6(float) FNegate 42 - 44: 40(ptr) AccessChain 28 29 39 - Store 44 43 - 46: 40(ptr) AccessChain 28 29 45 - 47: 6(float) Load 46 - 49: 40(ptr) AccessChain 28 29 48 - 50: 6(float) Load 49 - 51: 6(float) FAdd 47 50 - 53: 6(float) FDiv 51 52 - 54: 40(ptr) AccessChain 28 29 45 - Store 54 53 - Return - FunctionEnd -#endif - -static const uint32_t cube_vert[396] = { - 0x07230203, 0x00010000, 0x00080001, 0x00000037, 0x00000000, 0x00020011, 0x00000001, 0x0006000b, 0x00000001, 0x4c534c47, - 0x6474732e, 0x3035342e, 0x00000000, 0x0003000e, 0x00000000, 0x00000001, 0x0008000f, 0x00000000, 0x00000004, 0x6e69616d, - 0x00000000, 0x00000009, 0x00000015, 0x0000001c, 0x00030003, 0x00000002, 0x00000190, 0x00090004, 0x415f4c47, 0x735f4252, - 0x72617065, 0x5f657461, 0x64616873, 0x6f5f7265, 0x63656a62, 0x00007374, 0x00090004, 0x415f4c47, 0x735f4252, 0x69646168, - 0x6c5f676e, 0x75676e61, 0x5f656761, 0x70303234, 0x006b6361, 0x00040005, 0x00000004, 0x6e69616d, 0x00000000, 0x00050005, - 0x00000009, 0x63786574, 0x64726f6f, 0x00000000, 0x00030005, 0x0000000f, 0x00667562, 0x00040006, 0x0000000f, 0x00000000, - 0x0050564d, 0x00060006, 0x0000000f, 0x00000001, 0x69736f70, 0x6e6f6974, 0x00000000, 0x00050006, 0x0000000f, 0x00000002, - 0x72747461, 0x00000000, 0x00040005, 0x00000011, 0x66756275, 0x00000000, 0x00060005, 0x00000015, 0x565f6c67, 0x65747265, - 0x646e4978, 0x00007865, 0x00060005, 0x0000001a, 0x505f6c67, 0x65567265, 0x78657472, 0x00000000, 0x00060006, 0x0000001a, - 0x00000000, 0x505f6c67, 0x7469736f, 0x006e6f69, 0x00030005, 0x0000001c, 0x00000000, 0x00040047, 0x00000009, 0x0000001e, - 0x00000000, 0x00040047, 0x0000000d, 0x00000006, 0x00000010, 0x00040047, 0x0000000e, 0x00000006, 0x00000010, 0x00040048, - 0x0000000f, 0x00000000, 0x00000005, 0x00050048, 0x0000000f, 0x00000000, 0x00000023, 0x00000000, 0x00050048, 0x0000000f, - 0x00000000, 0x00000007, 0x00000010, 0x00050048, 0x0000000f, 0x00000001, 0x00000023, 0x00000040, 0x00050048, 0x0000000f, - 0x00000002, 0x00000023, 0x00000280, 0x00030047, 0x0000000f, 0x00000002, 0x00040047, 0x00000011, 0x00000022, 0x00000000, - 0x00040047, 0x00000011, 0x00000021, 0x00000000, 0x00040047, 0x00000015, 0x0000000b, 0x0000002a, 0x00050048, 0x0000001a, - 0x00000000, 0x0000000b, 0x00000000, 0x00030047, 0x0000001a, 0x00000002, 0x00020013, 0x00000002, 0x00030021, 0x00000003, - 0x00000002, 0x00030016, 0x00000006, 0x00000020, 0x00040017, 0x00000007, 0x00000006, 0x00000004, 0x00040020, 0x00000008, - 0x00000003, 0x00000007, 0x0004003b, 0x00000008, 0x00000009, 0x00000003, 0x00040018, 0x0000000a, 0x00000007, 0x00000004, - 0x00040015, 0x0000000b, 0x00000020, 0x00000000, 0x0004002b, 0x0000000b, 0x0000000c, 0x00000024, 0x0004001c, 0x0000000d, - 0x00000007, 0x0000000c, 0x0004001c, 0x0000000e, 0x00000007, 0x0000000c, 0x0005001e, 0x0000000f, 0x0000000a, 0x0000000d, - 0x0000000e, 0x00040020, 0x00000010, 0x00000002, 0x0000000f, 0x0004003b, 0x00000010, 0x00000011, 0x00000002, 0x00040015, - 0x00000012, 0x00000020, 0x00000001, 0x0004002b, 0x00000012, 0x00000013, 0x00000002, 0x00040020, 0x00000014, 0x00000001, - 0x00000012, 0x0004003b, 0x00000014, 0x00000015, 0x00000001, 0x00040020, 0x00000017, 0x00000002, 0x00000007, 0x0003001e, - 0x0000001a, 0x00000007, 0x00040020, 0x0000001b, 0x00000003, 0x0000001a, 0x0004003b, 0x0000001b, 0x0000001c, 0x00000003, - 0x0004002b, 0x00000012, 0x0000001d, 0x00000000, 0x00040020, 0x0000001e, 0x00000002, 0x0000000a, 0x0004002b, 0x00000012, - 0x00000021, 0x00000001, 0x0004002b, 0x0000000b, 0x00000027, 0x00000001, 0x00040020, 0x00000028, 0x00000003, 0x00000006, - 0x0004002b, 0x0000000b, 0x0000002d, 0x00000002, 0x0004002b, 0x0000000b, 0x00000030, 0x00000003, 0x0004002b, 0x00000006, - 0x00000034, 0x40000000, 0x00050036, 0x00000002, 0x00000004, 0x00000000, 0x00000003, 0x000200f8, 0x00000005, 0x0004003d, - 0x00000012, 0x00000016, 0x00000015, 0x00060041, 0x00000017, 0x00000018, 0x00000011, 0x00000013, 0x00000016, 0x0004003d, - 0x00000007, 0x00000019, 0x00000018, 0x0003003e, 0x00000009, 0x00000019, 0x00050041, 0x0000001e, 0x0000001f, 0x00000011, - 0x0000001d, 0x0004003d, 0x0000000a, 0x00000020, 0x0000001f, 0x0004003d, 0x00000012, 0x00000022, 0x00000015, 0x00060041, - 0x00000017, 0x00000023, 0x00000011, 0x00000021, 0x00000022, 0x0004003d, 0x00000007, 0x00000024, 0x00000023, 0x00050091, - 0x00000007, 0x00000025, 0x00000020, 0x00000024, 0x00050041, 0x00000008, 0x00000026, 0x0000001c, 0x0000001d, 0x0003003e, - 0x00000026, 0x00000025, 0x00060041, 0x00000028, 0x00000029, 0x0000001c, 0x0000001d, 0x00000027, 0x0004003d, 0x00000006, - 0x0000002a, 0x00000029, 0x0004007f, 0x00000006, 0x0000002b, 0x0000002a, 0x00060041, 0x00000028, 0x0000002c, 0x0000001c, - 0x0000001d, 0x00000027, 0x0003003e, 0x0000002c, 0x0000002b, 0x00060041, 0x00000028, 0x0000002e, 0x0000001c, 0x0000001d, - 0x0000002d, 0x0004003d, 0x00000006, 0x0000002f, 0x0000002e, 0x00060041, 0x00000028, 0x00000031, 0x0000001c, 0x0000001d, - 0x00000030, 0x0004003d, 0x00000006, 0x00000032, 0x00000031, 0x00050081, 0x00000006, 0x00000033, 0x0000002f, 0x00000032, - 0x00050088, 0x00000006, 0x00000035, 0x00000033, 0x00000034, 0x00060041, 0x00000028, 0x00000036, 0x0000001c, 0x0000001d, - 0x0000002d, 0x0003003e, 0x00000036, 0x00000035, 0x000100fd, 0x00010038, -}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/include/cube.vert.inc new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/include/cube.vert.inc --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/android/include/cube.vert.inc 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/android/include/cube.vert.inc 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ - // Overload400-PrecQual.2000 12-Apr-2017 - 0x07230203,0x00010000,0x00080002,0x00000029,0x00000000,0x00020011,0x00000001,0x0006000b, - 0x00000001,0x4c534c47,0x6474732e,0x3035342e,0x00000000,0x0003000e,0x00000000,0x00000001, - 0x0008000f,0x00000000,0x00000004,0x6e69616d,0x00000000,0x00000009,0x00000015,0x0000001e, - 0x00030003,0x00000002,0x00000190,0x00090004,0x415f4c47,0x735f4252,0x72617065,0x5f657461, - 0x64616873,0x6f5f7265,0x63656a62,0x00007374,0x00090004,0x415f4c47,0x735f4252,0x69646168, - 0x6c5f676e,0x75676e61,0x5f656761,0x70303234,0x006b6361,0x00040005,0x00000004,0x6e69616d, - 0x00000000,0x00050005,0x00000009,0x63786574,0x64726f6f,0x00000000,0x00030005,0x0000000f, - 0x00667562,0x00040006,0x0000000f,0x00000000,0x0050564d,0x00060006,0x0000000f,0x00000001, - 0x69736f70,0x6e6f6974,0x00000000,0x00050006,0x0000000f,0x00000002,0x72747461,0x00000000, - 0x00040005,0x00000011,0x66756275,0x00000000,0x00060005,0x00000015,0x565f6c67,0x65747265, - 0x646e4978,0x00007865,0x00060005,0x0000001c,0x505f6c67,0x65567265,0x78657472,0x00000000, - 0x00060006,0x0000001c,0x00000000,0x505f6c67,0x7469736f,0x006e6f69,0x00070006,0x0000001c, - 0x00000001,0x505f6c67,0x746e696f,0x657a6953,0x00000000,0x00070006,0x0000001c,0x00000002, - 0x435f6c67,0x4470696c,0x61747369,0x0065636e,0x00030005,0x0000001e,0x00000000,0x00040047, - 0x00000009,0x0000001e,0x00000000,0x00040047,0x0000000d,0x00000006,0x00000010,0x00040047, - 0x0000000e,0x00000006,0x00000010,0x00040048,0x0000000f,0x00000000,0x00000005,0x00050048, - 0x0000000f,0x00000000,0x00000023,0x00000000,0x00050048,0x0000000f,0x00000000,0x00000007, - 0x00000010,0x00050048,0x0000000f,0x00000001,0x00000023,0x00000040,0x00050048,0x0000000f, - 0x00000002,0x00000023,0x00000280,0x00030047,0x0000000f,0x00000002,0x00040047,0x00000011, - 0x00000022,0x00000000,0x00040047,0x00000011,0x00000021,0x00000000,0x00040047,0x00000015, - 0x0000000b,0x0000002a,0x00050048,0x0000001c,0x00000000,0x0000000b,0x00000000,0x00050048, - 0x0000001c,0x00000001,0x0000000b,0x00000001,0x00050048,0x0000001c,0x00000002,0x0000000b, - 0x00000003,0x00030047,0x0000001c,0x00000002,0x00020013,0x00000002,0x00030021,0x00000003, - 0x00000002,0x00030016,0x00000006,0x00000020,0x00040017,0x00000007,0x00000006,0x00000004, - 0x00040020,0x00000008,0x00000003,0x00000007,0x0004003b,0x00000008,0x00000009,0x00000003, - 0x00040018,0x0000000a,0x00000007,0x00000004,0x00040015,0x0000000b,0x00000020,0x00000000, - 0x0004002b,0x0000000b,0x0000000c,0x00000024,0x0004001c,0x0000000d,0x00000007,0x0000000c, - 0x0004001c,0x0000000e,0x00000007,0x0000000c,0x0005001e,0x0000000f,0x0000000a,0x0000000d, - 0x0000000e,0x00040020,0x00000010,0x00000002,0x0000000f,0x0004003b,0x00000010,0x00000011, - 0x00000002,0x00040015,0x00000012,0x00000020,0x00000001,0x0004002b,0x00000012,0x00000013, - 0x00000002,0x00040020,0x00000014,0x00000001,0x00000012,0x0004003b,0x00000014,0x00000015, - 0x00000001,0x00040020,0x00000017,0x00000002,0x00000007,0x0004002b,0x0000000b,0x0000001a, - 0x00000001,0x0004001c,0x0000001b,0x00000006,0x0000001a,0x0005001e,0x0000001c,0x00000007, - 0x00000006,0x0000001b,0x00040020,0x0000001d,0x00000003,0x0000001c,0x0004003b,0x0000001d, - 0x0000001e,0x00000003,0x0004002b,0x00000012,0x0000001f,0x00000000,0x00040020,0x00000020, - 0x00000002,0x0000000a,0x0004002b,0x00000012,0x00000023,0x00000001,0x00050036,0x00000002, - 0x00000004,0x00000000,0x00000003,0x000200f8,0x00000005,0x0004003d,0x00000012,0x00000016, - 0x00000015,0x00060041,0x00000017,0x00000018,0x00000011,0x00000013,0x00000016,0x0004003d, - 0x00000007,0x00000019,0x00000018,0x0003003e,0x00000009,0x00000019,0x00050041,0x00000020, - 0x00000021,0x00000011,0x0000001f,0x0004003d,0x0000000a,0x00000022,0x00000021,0x0004003d, - 0x00000012,0x00000024,0x00000015,0x00060041,0x00000017,0x00000025,0x00000011,0x00000023, - 0x00000024,0x0004003d,0x00000007,0x00000026,0x00000025,0x00050091,0x00000007,0x00000027, - 0x00000022,0x00000026,0x00050041,0x00000008,0x00000028,0x0000001e,0x0000001f,0x0003003e, - 0x00000028,0x00000027,0x000100fd,0x00010038 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/cube.c new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/cube.c --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/cube.c 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/cube.c 2024-05-06 21:20:39.000000000 +0200 @@ -394,6 +394,7 @@ VkPresentModeKHR presentMode; VkFence fences[FRAME_LAG]; int frame_index; + bool first_swapchain_frame; VkCommandPool cmd_pool; VkCommandPool present_cmd_pool; @@ -1134,10 +1135,17 @@ uint32_t eighthOfWidth = demo->width / 8; uint32_t eighthOfHeight = demo->height / 8; - rect.offset.x = eighthOfWidth; - rect.offset.y = eighthOfHeight; - rect.extent.width = eighthOfWidth * 6; - rect.extent.height = eighthOfHeight * 6; + if (demo->first_swapchain_frame) { + rect.offset.x = 0; + rect.offset.y = 0; + rect.extent.width = demo->width; + rect.extent.height = demo->height; + } else { + rect.offset.x = eighthOfWidth; + rect.offset.y = eighthOfHeight; + rect.extent.width = eighthOfWidth * 6; + rect.extent.height = eighthOfHeight * 6; + } rect.layer = 0; region.rectangleCount = 1; @@ -1188,6 +1196,7 @@ err = vkQueuePresentKHR(demo->present_queue, &present); demo->frame_index += 1; demo->frame_index %= FRAME_LAG; + demo->first_swapchain_frame = false; if (err == VK_ERROR_OUT_OF_DATE_KHR) { // demo->swapchain is out of date (e.g. the window was resized) and @@ -2152,8 +2161,6 @@ pipeline.renderPass = demo->render_pass; pipeline.pDynamicState = &dynamicState; - pipeline.renderPass = demo->render_pass; - err = vkCreateGraphicsPipelines(demo->device, demo->pipelineCache, 1, &pipeline, NULL, &demo->pipeline); assert(!err); @@ -2359,6 +2366,7 @@ demo->current_buffer = 0; demo->prepared = true; + demo->first_swapchain_frame = true; } static void demo_cleanup(struct demo *demo) { @@ -2817,10 +2825,24 @@ #elif defined(VK_USE_PLATFORM_WAYLAND_KHR) static void demo_run(struct demo *demo) { while (!demo->quit) { + // Flush any commands to the server + wl_display_flush(demo->display); + if (demo->pause) { - wl_display_dispatch(demo->display); // block and wait for input + // block and wait for input + wl_display_dispatch(demo->display); } else { - wl_display_dispatch_pending(demo->display); // don't block + // Lock the display event queue in case the driver is doing something on another thread + // while we wait, keep pumping events + while (wl_display_prepare_read(demo->display) != 0) { + wl_display_dispatch_pending(demo->display); + } + // Actually do the read from the socket + wl_display_read_events(demo->display); + + // Pump events + wl_display_dispatch_pending(demo->display); + demo_draw(demo); demo->curFrame++; if (demo->frameCount != INT32_MAX && demo->curFrame == demo->frameCount) demo->quit = true; @@ -4009,6 +4031,7 @@ } } demo->frame_index = 0; + demo->first_swapchain_frame = true; // Get Memory information and properties vkGetPhysicalDeviceMemoryProperties(demo->gpu, &demo->memory_properties); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/cube.cpp new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/cube.cpp --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/cube/cube.cpp 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/cube/cube.cpp 2024-05-06 21:20:39.000000000 +0200 @@ -40,7 +40,7 @@ #define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1 #define VULKAN_HPP_NO_EXCEPTIONS -#define VULKAN_HPP_TYPESAFE_CONVERSION +#define VULKAN_HPP_TYPESAFE_CONVERSION 1 #include <vulkan/vulkan.hpp> #define VOLK_IMPLEMENTATION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/icd/VkICD_mock_icd.json.in new/Vulkan-Tools-vulkan-sdk-1.3.283.0/icd/VkICD_mock_icd.json.in --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/icd/VkICD_mock_icd.json.in 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/icd/VkICD_mock_icd.json.in 2024-05-06 21:20:39.000000000 +0200 @@ -2,6 +2,6 @@ "file_format_version": "1.0.1", "ICD": { "library_path": "@JSON_LIBRARY_PATH@", - "api_version": "1.3.280" + "api_version": "1.3.283" } } \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/icd/generated/function_declarations.h new/Vulkan-Tools-vulkan-sdk-1.3.283.0/icd/generated/function_declarations.h --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/icd/generated/function_declarations.h 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/icd/generated/function_declarations.h 2024-05-06 21:20:39.000000000 +0200 @@ -284,7 +284,7 @@ {"VK_QCOM_render_pass_store_ops", 2}, {"VK_NV_cuda_kernel_launch", 2}, {"VK_NV_low_latency", 1}, - {"VK_EXT_metal_objects", 1}, + {"VK_EXT_metal_objects", 2}, {"VK_KHR_synchronization2", 1}, {"VK_EXT_descriptor_buffer", 1}, {"VK_EXT_graphics_pipeline_library", 1}, @@ -363,7 +363,7 @@ {"VK_EXT_shader_module_identifier", 1}, {"VK_EXT_rasterization_order_attachment_access", 1}, {"VK_NV_optical_flow", 1}, - {"VK_EXT_legacy_dithering", 1}, + {"VK_EXT_legacy_dithering", 2}, {"VK_EXT_pipeline_protected_access", 1}, {"VK_ANDROID_external_format_resolve", 1}, {"VK_KHR_maintenance5", 1}, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/icd/generated/function_definitions.h new/Vulkan-Tools-vulkan-sdk-1.3.283.0/icd/generated/function_definitions.h --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/icd/generated/function_definitions.h 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/icd/generated/function_definitions.h 2024-05-06 21:20:39.000000000 +0200 @@ -377,7 +377,16 @@ const VkSubmitInfo* pSubmits, VkFence fence) { -//Not a CREATE or DESTROY function + // Special way to cause DEVICE_LOST + // Picked VkExportFenceCreateInfo because needed some struct that wouldn't get cleared by validation Safe Struct + // ... TODO - It would be MUCH nicer to have a layer or other setting control when this occured + // For now this is used to allow Validation Layers test reacting to device losts + if (submitCount > 0 && pSubmits) { + auto pNext = reinterpret_cast<const VkBaseInStructure *>(pSubmits[0].pNext); + if (pNext && pNext->sType == VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO && pNext->pNext == nullptr) { + return VK_ERROR_DEVICE_LOST; + } + } return VK_SUCCESS; } @@ -3577,10 +3586,9 @@ { auto *external_image_prop = lvl_find_mod_in_chain<VkExternalImageFormatProperties>(pImageFormatProperties->pNext); auto *external_image_format = lvl_find_in_chain<VkPhysicalDeviceExternalImageFormatInfo>(pImageFormatInfo->pNext); - if (external_image_prop && external_image_format && external_image_format->handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) { + if (external_image_prop && external_image_format) { external_image_prop->externalMemoryProperties.externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT; external_image_prop->externalMemoryProperties.compatibleHandleTypes = external_image_format->handleType; - external_image_prop->externalMemoryProperties.compatibleHandleTypes = external_image_format->handleType; } GetPhysicalDeviceImageFormatProperties(physicalDevice, pImageFormatInfo->format, pImageFormatInfo->type, pImageFormatInfo->tiling, pImageFormatInfo->usage, pImageFormatInfo->flags, &pImageFormatProperties->imageFormatProperties); @@ -3748,7 +3756,7 @@ HANDLE handle, VkMemoryWin32HandlePropertiesKHR* pMemoryWin32HandleProperties) { -//Not a CREATE or DESTROY function + pMemoryWin32HandleProperties->memoryTypeBits = 0xFFFF; return VK_SUCCESS; } #endif /* VK_USE_PLATFORM_WIN32_KHR */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/scripts/known_good.json new/Vulkan-Tools-vulkan-sdk-1.3.283.0/scripts/known_good.json --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/scripts/known_good.json 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/scripts/known_good.json 2024-05-06 21:20:39.000000000 +0200 @@ -7,7 +7,7 @@ "sub_dir": "Vulkan-Headers", "build_dir": "Vulkan-Headers/build", "install_dir": "Vulkan-Headers/build/install", - "commit": "v1.3.280" + "commit": "v1.3.283" }, { "name": "MoltenVK", @@ -35,7 +35,7 @@ "cmake_options": [ "-DVOLK_INSTALL=ON" ], - "commit": "vulkan-sdk-1.3.280", + "commit": "vulkan-sdk-1.3.283", "deps": [ { "var_name": "VULKAN_HEADERS_INSTALL_DIR", @@ -74,7 +74,7 @@ "cmake_options": [ "-DLOADER_USE_UNSAFE_FILE_SEARCH=ON" ], - "commit": "v1.3.280", + "commit": "v1.3.283", "build_platforms": [ "windows", "linux", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/scripts/mock_icd_generator.py new/Vulkan-Tools-vulkan-sdk-1.3.283.0/scripts/mock_icd_generator.py --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/scripts/mock_icd_generator.py 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/scripts/mock_icd_generator.py 2024-05-06 21:20:39.000000000 +0200 @@ -531,10 +531,9 @@ 'vkGetPhysicalDeviceImageFormatProperties2KHR': ''' auto *external_image_prop = lvl_find_mod_in_chain<VkExternalImageFormatProperties>(pImageFormatProperties->pNext); auto *external_image_format = lvl_find_in_chain<VkPhysicalDeviceExternalImageFormatInfo>(pImageFormatInfo->pNext); - if (external_image_prop && external_image_format && external_image_format->handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_ANDROID_HARDWARE_BUFFER_BIT_ANDROID) { + if (external_image_prop && external_image_format) { external_image_prop->externalMemoryProperties.externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT; external_image_prop->externalMemoryProperties.compatibleHandleTypes = external_image_format->handleType; - external_image_prop->externalMemoryProperties.compatibleHandleTypes = external_image_format->handleType; } GetPhysicalDeviceImageFormatProperties(physicalDevice, pImageFormatInfo->format, pImageFormatInfo->type, pImageFormatInfo->tiling, pImageFormatInfo->usage, pImageFormatInfo->flags, &pImageFormatProperties->imageFormatProperties); @@ -1654,6 +1653,23 @@ *pFence = (VkFence)global_unique_handle++; return VK_SUCCESS; ''', +'vkQueueSubmit': ''' + // Special way to cause DEVICE_LOST + // Picked VkExportFenceCreateInfo because needed some struct that wouldn't get cleared by validation Safe Struct + // ... TODO - It would be MUCH nicer to have a layer or other setting control when this occured + // For now this is used to allow Validation Layers test reacting to device losts + if (submitCount > 0 && pSubmits) { + auto pNext = reinterpret_cast<const VkBaseInStructure *>(pSubmits[0].pNext); + if (pNext && pNext->sType == VK_STRUCTURE_TYPE_EXPORT_FENCE_CREATE_INFO && pNext->pNext == nullptr) { + return VK_ERROR_DEVICE_LOST; + } + } + return VK_SUCCESS; +''', +'vkGetMemoryWin32HandlePropertiesKHR': ''' + pMemoryWin32HandleProperties->memoryTypeBits = 0xFFFF; + return VK_SUCCESS; +''' } # MockICDGeneratorOptions - subclass of GeneratorOptions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/scripts/update_deps.py new/Vulkan-Tools-vulkan-sdk-1.3.283.0/scripts/update_deps.py --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/scripts/update_deps.py 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/scripts/update_deps.py 2024-05-06 21:20:39.000000000 +0200 @@ -492,11 +492,12 @@ # Use the CMake -A option to select the platform architecture # without needing a Visual Studio generator. if platform.system() == 'Windows' and self._args.generator != "Ninja": + cmake_cmd.append('-A') if self._args.arch.lower() == '64' or self._args.arch == 'x64' or self._args.arch == 'win64': - cmake_cmd.append('-A') cmake_cmd.append('x64') + elif self._args.arch == 'arm64': + cmake_cmd.append('arm64') else: - cmake_cmd.append('-A') cmake_cmd.append('Win32') # Apply a generator, if one is specified. This can be used to supply @@ -677,7 +678,7 @@ parser.add_argument( '--arch', dest='arch', - choices=['32', '64', 'x86', 'x64', 'win32', 'win64'], + choices=['32', '64', 'x86', 'x64', 'win32', 'win64', 'arm64'], type=str.lower, help="Set build files architecture (Visual Studio Generator Only)", default='64') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/tests/CMakeLists.txt new/Vulkan-Tools-vulkan-sdk-1.3.283.0/tests/CMakeLists.txt --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/tests/CMakeLists.txt 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/tests/CMakeLists.txt 2024-05-06 21:20:39.000000000 +0200 @@ -31,21 +31,6 @@ find_package(VulkanLoader CONFIG) -# setup binary_locations_$<CONFIG>.h.in using binary_locations.h.in as a source -file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/binary_locations_$<CONFIG>.h" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/binary_locations.h.in") - -# copy binary_locations_$<CONFIG> to the build directory -add_custom_command( - PRE_BUILD - COMMAND ${CMAKE_COMMAND} "-E" "copy_if_different" "${CMAKE_CURRENT_BINARY_DIR}/binary_locations_$<CONFIG>.h" "${CMAKE_CURRENT_BINARY_DIR}/binary_locations.h" - VERBATIM - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/binary_locations_$<CONFIG>.h" - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/binary_locations.h" - COMMENT "creating binary_locations.h file ({event: PRE_BUILD}, {filename: binary_locations.h })" - ) -add_custom_target (generate_binary_locations DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/binary_locations.h") -add_dependencies (generate_binary_locations vkcube vkcubepp VkICD_mock_icd vulkaninfo) - find_package(GTest REQUIRED CONFIG QUIET) add_executable(vulkan_tools_tests) @@ -57,14 +42,16 @@ get_target_property(TEST_SOURCES vulkan_tools_tests SOURCES) source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES ${TEST_SOURCES}) -target_include_directories(vulkan_tools_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(vulkan_tools_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(vulkan_tools_tests GTest::gtest Vulkan::Headers Vulkan::Loader) -add_dependencies(vulkan_tools_tests generate_binary_locations) if (WIN32) target_compile_definitions(vulkan_tools_tests PUBLIC -DVK_USE_PLATFORM_WIN32_KHR -DWIN32_LEAN_AND_MEAN -DNOMINMAX) endif() set_target_properties(vulkan_tools_tests PROPERTIES MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL") +# Set the exact path to Mock JSON ICD +target_compile_definitions(vulkan_tools_tests PRIVATE MOCK_ICD_JSON_MANIFEST_PATH="$<TARGET_FILE_DIR:VkICD_mock_icd>") + if (DEFINED GIT_BRANCH_NAME AND DEFINED GIT_TAG_INFO) target_compile_definitions(vulkan_tools_tests PRIVATE GIT_BRANCH_NAME="${GIT_BRANCH_NAME}" GIT_TAG_INFO="${GIT_TAG_INFO}") endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/tests/binary_locations.h.in new/Vulkan-Tools-vulkan-sdk-1.3.283.0/tests/binary_locations.h.in --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/tests/binary_locations.h.in 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/tests/binary_locations.h.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2023 The Khronos Group Inc. - * Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#define MOCK_ICD_JSON_MANIFEST_PATH "$<TARGET_FILE_DIR:VkICD_mock_icd>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/tests/test_common.h new/Vulkan-Tools-vulkan-sdk-1.3.283.0/tests/test_common.h --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/tests/test_common.h 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/tests/test_common.h 2024-05-06 21:20:39.000000000 +0200 @@ -26,9 +26,6 @@ #include "gtest/gtest.h" #include "vulkan/vulkan.h" -// Location of the built binaries in this repo -#include "binary_locations.h" - #if defined(WIN32) #include <windows.h> inline int set_environment_var(const char* name, const char* value) { return SetEnvironmentVariable(name, value); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/vulkaninfo/generated/vulkaninfo.hpp new/Vulkan-Tools-vulkan-sdk-1.3.283.0/vulkaninfo/generated/vulkaninfo.hpp --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/vulkaninfo/generated/vulkaninfo.hpp 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/vulkaninfo/generated/vulkaninfo.hpp 2024-05-06 21:20:39.000000000 +0200 @@ -358,7 +358,7 @@ case (VK_FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG): return "FORMAT_PVRTC1_4BPP_SRGB_BLOCK_IMG"; case (VK_FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG): return "FORMAT_PVRTC2_2BPP_SRGB_BLOCK_IMG"; case (VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG): return "FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG"; - case (VK_FORMAT_R16G16_S10_5_NV): return "FORMAT_R16G16_S10_5_NV"; + case (VK_FORMAT_R16G16_SFIXED5_NV): return "FORMAT_R16G16_SFIXED5_NV"; case (VK_FORMAT_A1B5G5R5_UNORM_PACK16_KHR): return "FORMAT_A1B5G5R5_UNORM_PACK16_KHR"; case (VK_FORMAT_A8_UNORM_KHR): return "FORMAT_A8_UNORM_KHR"; default: return std::string("UNKNOWN_VkFormat_value") + std::to_string(value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-vulkan-sdk-1.3.280.0/vulkaninfo/vulkaninfo.cpp new/Vulkan-Tools-vulkan-sdk-1.3.283.0/vulkaninfo/vulkaninfo.cpp --- old/Vulkan-Tools-vulkan-sdk-1.3.280.0/vulkaninfo/vulkaninfo.cpp 2024-03-16 17:34:10.000000000 +0100 +++ new/Vulkan-Tools-vulkan-sdk-1.3.283.0/vulkaninfo/vulkaninfo.cpp 2024-05-06 21:20:39.000000000 +0200 @@ -206,6 +206,10 @@ if (err == VK_SUCCESS) { ObjectWrapper present_mode_obj(p, VkPresentModeKHRString(mode)); + + p.PrintKeyValue("minImageCount", surface_caps2.surfaceCapabilities.minImageCount); + p.PrintKeyValue("maxImageCount", surface_caps2.surfaceCapabilities.maxImageCount); + DumpVkSurfacePresentScalingCapabilitiesEXT(p, "VkSurfacePresentScalingCapabilitiesEXT", SurfacePresentScalingCapabilitiesEXT); DumpVkSurfacePresentModeCompatibilityEXT(p, "VkSurfacePresentModeCompatibilityEXT", @@ -696,7 +700,6 @@ if (gpu.inst.CheckExtensionEnabled(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) { void *place = gpu.props2.pNext; chain_iterator_phys_device_props2(p, gpu.inst, gpu, place); - GetAndDumpHostImageCopyPropertiesEXT(p, gpu); } } {
