diff options
-rw-r--r-- | src/tests/func/miptree/miptree_gen.c | 312 | ||||
-rwxr-xr-x | src/tests/func/miptree/miptree_gen.py | 2 |
2 files changed, 314 insertions, 0 deletions
diff --git a/src/tests/func/miptree/miptree_gen.c b/src/tests/func/miptree/miptree_gen.c index c6f0a2c..8580fd0 100644 --- a/src/tests/func/miptree/miptree_gen.c +++ b/src/tests/func/miptree/miptree_gen.c @@ -2055,6 +2055,32 @@ test_define { ".levels01" ".array01" ".extent-1024x512" + ".upload-copy-from-buffer.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_D32_SFLOAT, + .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 1, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 1, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".d32-sfloat" + ".aspect-depth" + ".view-2d" + ".levels01" + ".array01" + ".extent-1024x512" ".upload-copy-from-linear-image.download-copy-to-buffer", .start = test, .skip = false, @@ -2105,6 +2131,32 @@ test_define { ".aspect-depth" ".view-2d" ".levels01" + ".array01" + ".extent-1024x512" + ".upload-copy-from-linear-image.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_D32_SFLOAT, + .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 1, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 1, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_LINEAR_IMAGE, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".d32-sfloat" + ".aspect-depth" + ".view-2d" + ".levels01" ".array02" ".extent-1024x512" ".upload-copy-from-buffer.download-copy-to-buffer", @@ -2159,6 +2211,32 @@ test_define { ".levels01" ".array02" ".extent-1024x512" + ".upload-copy-from-buffer.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_D32_SFLOAT, + .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 1, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 2, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".d32-sfloat" + ".aspect-depth" + ".view-2d" + ".levels01" + ".array02" + ".extent-1024x512" ".upload-copy-from-linear-image.download-copy-to-buffer", .start = test, .skip = false, @@ -2208,6 +2286,32 @@ test_define { ".d32-sfloat" ".aspect-depth" ".view-2d" + ".levels01" + ".array02" + ".extent-1024x512" + ".upload-copy-from-linear-image.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_D32_SFLOAT, + .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 1, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 2, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_LINEAR_IMAGE, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".d32-sfloat" + ".aspect-depth" + ".view-2d" ".levels02" ".array01" ".extent-1024x512" @@ -2263,6 +2367,32 @@ test_define { ".levels02" ".array01" ".extent-1024x512" + ".upload-copy-from-buffer.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_D32_SFLOAT, + .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 2, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 1, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".d32-sfloat" + ".aspect-depth" + ".view-2d" + ".levels02" + ".array01" + ".extent-1024x512" ".upload-copy-from-linear-image.download-copy-to-buffer", .start = test, .skip = false, @@ -2313,6 +2443,32 @@ test_define { ".aspect-depth" ".view-2d" ".levels02" + ".array01" + ".extent-1024x512" + ".upload-copy-from-linear-image.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_D32_SFLOAT, + .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 2, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 1, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_LINEAR_IMAGE, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".d32-sfloat" + ".aspect-depth" + ".view-2d" + ".levels02" ".array02" ".extent-1024x512" ".upload-copy-from-buffer.download-copy-to-buffer", @@ -2367,6 +2523,32 @@ test_define { ".levels02" ".array02" ".extent-1024x512" + ".upload-copy-from-buffer.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_D32_SFLOAT, + .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 2, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 2, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".d32-sfloat" + ".aspect-depth" + ".view-2d" + ".levels02" + ".array02" + ".extent-1024x512" ".upload-copy-from-linear-image.download-copy-to-buffer", .start = test, .skip = false, @@ -2415,6 +2597,32 @@ test_define { .name = "func.miptree" ".d32-sfloat" ".aspect-depth" + ".view-2d" + ".levels02" + ".array02" + ".extent-1024x512" + ".upload-copy-from-linear-image.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_D32_SFLOAT, + .aspect = VK_IMAGE_ASPECT_DEPTH_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 2, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 2, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_LINEAR_IMAGE, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".d32-sfloat" + ".aspect-depth" ".view-3d" ".levels01" "" @@ -2755,6 +2963,32 @@ test_define { ".aspect-stencil" ".view-2d" ".levels01" + ".array01" + ".extent-1024x512" + ".upload-copy-from-buffer.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_S8_UINT, + .aspect = VK_IMAGE_ASPECT_STENCIL_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 1, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 1, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".s8-uint" + ".aspect-stencil" + ".view-2d" + ".levels01" ".array02" ".extent-1024x512" ".upload-copy-from-buffer.download-copy-to-buffer", @@ -2780,6 +3014,32 @@ test_define { ".s8-uint" ".aspect-stencil" ".view-2d" + ".levels01" + ".array02" + ".extent-1024x512" + ".upload-copy-from-buffer.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_S8_UINT, + .aspect = VK_IMAGE_ASPECT_STENCIL_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 1, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 2, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".s8-uint" + ".aspect-stencil" + ".view-2d" ".levels02" ".array01" ".extent-1024x512" @@ -2807,6 +3067,32 @@ test_define { ".aspect-stencil" ".view-2d" ".levels02" + ".array01" + ".extent-1024x512" + ".upload-copy-from-buffer.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_S8_UINT, + .aspect = VK_IMAGE_ASPECT_STENCIL_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 2, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 1, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".s8-uint" + ".aspect-stencil" + ".view-2d" + ".levels02" ".array02" ".extent-1024x512" ".upload-copy-from-buffer.download-copy-to-buffer", @@ -2831,6 +3117,32 @@ test_define { .name = "func.miptree" ".s8-uint" ".aspect-stencil" + ".view-2d" + ".levels02" + ".array02" + ".extent-1024x512" + ".upload-copy-from-buffer.download-copy-with-draw", + .start = test, + .skip = false, + .no_image = true, + .user_data = &(test_params_t) { + .format = VK_FORMAT_S8_UINT, + .aspect = VK_IMAGE_ASPECT_STENCIL_BIT, + .view_type = VK_IMAGE_VIEW_TYPE_2D, + .levels = 2, + .width = 1024, + .height = 512, + .depth = 1, + .array_length = 2, + .upload_method = MIPTREE_UPLOAD_METHOD_COPY_FROM_BUFFER, + .download_method = MIPTREE_DOWNLOAD_METHOD_COPY_WITH_DRAW, + }, +}; + +test_define { + .name = "func.miptree" + ".s8-uint" + ".aspect-stencil" ".view-3d" ".levels01" "" diff --git a/src/tests/func/miptree/miptree_gen.py b/src/tests/func/miptree/miptree_gen.py index a04f5a0..19dffb5 100755 --- a/src/tests/func/miptree/miptree_gen.py +++ b/src/tests/func/miptree/miptree_gen.py @@ -138,6 +138,7 @@ depth_2d_params_iter = ( for download_method in ( 'copy-to-buffer', 'copy-to-linear-image', + 'copy-with-draw', ) ) @@ -216,6 +217,7 @@ stencil_2d_params_iter = ( ) for download_method in ( 'copy-to-buffer', + 'copy-with-draw', # Intel doesn't support linear stencil images. See above comment. #'copy-to-linear-image', |