From: Marcin Kańtoch Date: Wed, 11 Sep 2019 14:23:07 +0000 (+0200) Subject: Change vertex buffer format to VK_FORMAT_R8G8B8A8_UNORM X-Git-Tag: upstream/1.3.5~1527^2^2~75 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6e78f208fc1eee97369363c846272e983a36c28e;p=platform%2Fupstream%2FVK-GL-CTS.git Change vertex buffer format to VK_FORMAT_R8G8B8A8_UNORM Change the vertex buffer format to VK_FORMAT_R8G8B8A8_UNORM in spirv1p4.entrypoint* tests to make the tests pass, while waiting on a fix in Amber. Affects: dEQP-VK.spirv_assembly.instruction.spirv1p4.entrypoint* Components: Vulkan VK-GL-CTS issue: 1992 Change-Id: Icb97b7328c2e1a61c1e1c20d7dda0449738619e1 --- diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_pc_entry_point.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_pc_entry_point.amber index 8b45ae7..a38ada6 100644 --- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_pc_entry_point.amber +++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_pc_entry_point.amber @@ -173,17 +173,17 @@ void main() { [vertex data] # position vert_color - 0/R8G8_SNORM 1/R8G8B8_UNORM + 0/R8G8_SNORM 1/R8G8B8A8_UNORM # Red for entire frame -# R8 G8 R8 G8 B8 - -128 -128 255 0 0 - 127 127 255 0 0 - -128 127 255 0 0 +# R8 G8 R8 G8 B8 A8 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + -128 127 255 0 0 255 - -128 -128 255 0 0 - 127 127 255 0 0 - 127 -128 255 0 0 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + 127 -128 255 0 0 255 [test] uniform float 0 0.0 0.0 0.3 0.0 diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ssbo_entry_point.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ssbo_entry_point.amber index 8d11847..9e02e87 100644 --- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ssbo_entry_point.amber +++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ssbo_entry_point.amber @@ -177,17 +177,17 @@ void main() { [vertex data] # position vert_color - 0/R8G8_SNORM 1/R8G8B8_UNORM + 0/R8G8_SNORM 1/R8G8B8A8_UNORM # Red for entire frame -# R8 G8 R8 G8 B8 - -128 -128 255 0 0 - 127 127 255 0 0 - -128 127 255 0 0 +# R8 G8 R8 G8 B8 A8 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + -128 127 255 0 0 255 - -128 -128 255 0 0 - 127 127 255 0 0 - 127 -128 255 0 0 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + 127 -128 255 0 0 255 [test] ssbo 0:0 subdata float 0 0.0 0.0 0.3 0.0 diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ubo_entry_point.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ubo_entry_point.amber index 0dc134d..24122fd 100644 --- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ubo_entry_point.amber +++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_con_ubo_entry_point.amber @@ -176,17 +176,17 @@ void main() { [vertex data] # position vert_color - 0/R8G8_SNORM 1/R8G8B8_UNORM + 0/R8G8_SNORM 1/R8G8B8A8_UNORM # Red for entire frame -# R8 G8 R8 G8 B8 - -128 -128 255 0 0 - 127 127 255 0 0 - -128 127 255 0 0 +# R8 G8 R8 G8 B8 A8 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + -128 127 255 0 0 255 - -128 -128 255 0 0 - 127 127 255 0 0 - 127 -128 255 0 0 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + 127 -128 255 0 0 255 [test] uniform ubo 0:0 float 0 0.0 0.0 0.3 0.0 diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_pc_entry_point.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_pc_entry_point.amber index 750c171..2ee71ab 100644 --- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_pc_entry_point.amber +++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_pc_entry_point.amber @@ -191,17 +191,17 @@ void main() { [vertex data] # position vert_color - 0/R8G8_SNORM 1/R8G8B8_UNORM + 0/R8G8_SNORM 1/R8G8B8A8_UNORM # Red for entire frame -# R8 G8 R8 G8 B8 - -128 -128 255 0 0 - 127 127 255 0 0 - -128 127 255 0 0 - - -128 -128 255 0 0 - 127 127 255 0 0 - 127 -128 255 0 0 +# R8 G8 R8 G8 B8 A8 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + -128 127 255 0 0 255 + + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + 127 -128 255 0 0 255 [test] uniform float 0 0.0 0.0 0.3 0.0 diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ssbo_entry_point.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ssbo_entry_point.amber index 953fa6a..a6148b0 100644 --- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ssbo_entry_point.amber +++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ssbo_entry_point.amber @@ -194,17 +194,17 @@ void main() { [vertex data] # position vert_color - 0/R8G8_SNORM 1/R8G8B8_UNORM + 0/R8G8_SNORM 1/R8G8B8A8_UNORM # Red for entire frame -# R8 G8 R8 G8 B8 - -128 -128 255 0 0 - 127 127 255 0 0 - -128 127 255 0 0 - - -128 -128 255 0 0 - 127 127 255 0 0 - 127 -128 255 0 0 +# R8 G8 R8 G8 B8 A8 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + -128 127 255 0 0 255 + + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + 127 -128 255 0 0 255 [test] ssbo 0:0 subdata float 0 0.0 0.0 0.3 0.0 diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ubo_entry_point.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ubo_entry_point.amber index d755817..7d2267a 100644 --- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ubo_entry_point.amber +++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/tess_eval_ubo_entry_point.amber @@ -194,17 +194,17 @@ void main() { [vertex data] # position vert_color - 0/R8G8_SNORM 1/R8G8B8_UNORM + 0/R8G8_SNORM 1/R8G8B8A8_UNORM # Red for entire frame -# R8 G8 R8 G8 B8 - -128 -128 255 0 0 - 127 127 255 0 0 - -128 127 255 0 0 - - -128 -128 255 0 0 - 127 127 255 0 0 - 127 -128 255 0 0 +# R8 G8 R8 G8 B8 A8 + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + -128 127 255 0 0 255 + + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + 127 -128 255 0 0 255 [test] uniform ubo 0:0 float 0 0.0 0.0 0.3 0.0 diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ssbo_entry_point.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ssbo_entry_point.amber index 65dc8be..12be351 100644 --- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ssbo_entry_point.amber +++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ssbo_entry_point.amber @@ -85,10 +85,10 @@ void main() { } [vertex data] - 0/R8G8_SNORM 1/R8G8B8_UNORM - -128 -128 255 0 0 - 127 127 255 0 0 - -128 127 255 0 0 + 0/R8G8_SNORM 1/R8G8B8A8_UNORM + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + -128 127 255 0 0 255 [test] ssbo 0:0 subdata float 0 -1.0 -1.0 1.0 -1.0 -1.0 1.0 diff --git a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ubo_entry_point.amber b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ubo_entry_point.amber index 370756c..cdf2f66 100644 --- a/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ubo_entry_point.amber +++ b/external/vulkancts/data/vulkan/amber/spirv_assembly/instruction/spirv1p4/entrypoint/vert_ubo_entry_point.amber @@ -85,10 +85,10 @@ void main() { } [vertex data] - 0/R8G8_SNORM 1/R8G8B8_UNORM - -128 -128 255 0 0 - 127 127 255 0 0 - -128 127 255 0 0 + 0/R8G8_SNORM 1/R8G8B8A8_UNORM + -128 -128 255 0 0 255 + 127 127 255 0 0 255 + -128 127 255 0 0 255 [test] uniform ubo 0:0 float 0 -1.0 -1.0 0.0 0.0 1.0 -1.0 0.0 0.0 -1.0 1.0