From afdbd2d30316148e5f1a35e11d70d04f64ef88f5 Mon Sep 17 00:00:00 2001 From: Dejan Mircevski Date: Thu, 27 Aug 2015 13:57:08 -0400 Subject: [PATCH] Add std450 instructions 53-64. --- source/ext_inst.cpp | 12 ++++++++++++ test/ExtInstGLSLstd450.cpp | 13 ++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/source/ext_inst.cpp b/source/ext_inst.cpp index a971694ad..717b3b0b6 100644 --- a/source/ext_inst.cpp +++ b/source/ext_inst.cpp @@ -72,6 +72,18 @@ static const spv_ext_inst_desc_t glslStd450Entries[] = { {GLSL450Inst2(Frexp)}, {GLSL450Inst1(FrexpStruct)}, {GLSL450Inst2(Ldexp)}, + {GLSL450Inst1(PackSnorm4x8)}, + {GLSL450Inst1(PackUnorm4x8)}, + {GLSL450Inst1(PackSnorm2x16)}, + {GLSL450Inst1(PackUnorm2x16)}, + {GLSL450Inst1(PackHalf2x16)}, + {GLSL450Inst1(PackDouble2x32)}, + {GLSL450Inst1(UnpackSnorm2x16)}, + {GLSL450Inst1(UnpackUnorm2x16)}, + {GLSL450Inst1(UnpackHalf2x16)}, + {GLSL450Inst1(UnpackSnorm4x8)}, + {GLSL450Inst1(UnpackUnorm4x8)}, + {GLSL450Inst1(UnpackDouble2x32)}, {GLSL450Inst1(Length)}, {GLSL450Inst2(Distance)}, {GLSL450Inst2(Cross)}, diff --git a/test/ExtInstGLSLstd450.cpp b/test/ExtInstGLSLstd450.cpp index bcbcaaaa9..574ff6c64 100644 --- a/test/ExtInstGLSLstd450.cpp +++ b/test/ExtInstGLSLstd450.cpp @@ -187,7 +187,18 @@ INSTANTIATE_TEST_CASE_P( {kF32Type, kF32Const, "%4", "Frexp", "%5 %5", 50, 7, {5, 5}}, {kF32Type, kF32Const, "%4", "FrexpStruct", "%5", 51, 6, {5}}, {kF32Type, kF32Const, "%4", "Ldexp", "%5 %5", 52, 7, {5, 5}}, - + {kF32Type, kF32Const, "%4", "PackSnorm4x8", "%5", 53, 6, {5}}, + {kF32Type, kF32Const, "%4", "PackUnorm4x8", "%5", 54, 6, {5}}, + {kF32Type, kF32Const, "%4", "PackSnorm2x16", "%5", 55, 6, {5}}, + {kF32Type, kF32Const, "%4", "PackUnorm2x16", "%5", 56, 6, {5}}, + {kF32Type, kF32Const, "%4", "PackHalf2x16", "%5", 57, 6, {5}}, + {kF32Type, kF32Const, "%4", "PackDouble2x32", "%5", 58, 6, {5}}, + {kF32Type, kF32Const, "%4", "UnpackSnorm2x16", "%5", 59, 6, {5}}, + {kF32Type, kF32Const, "%4", "UnpackUnorm2x16", "%5", 60, 6, {5}}, + {kF32Type, kF32Const, "%4", "UnpackHalf2x16", "%5", 61, 6, {5}}, + {kF32Type, kF32Const, "%4", "UnpackSnorm4x8", "%5", 62, 6, {5}}, + {kF32Type, kF32Const, "%4", "UnpackUnorm4x8", "%5", 63, 6, {5}}, + {kF32Type, kF32Const, "%4", "UnpackDouble2x32", "%5", 64, 6, {5}}, {kF32Type, kF32Const, "%4", "Length", "%5", 65, 6, {5}}, {kF32Type, kF32Const, "%4", "Distance", "%5 %5", 66, 7, {5, 5}}, {kF32Type, kF32Const, "%4", "Cross", "%5 %5", 67, 7, {5, 5}},