From 8c1c2ca0d7cd7b22e9843545c15fa475a3869625 Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Sun, 6 Dec 2015 19:33:07 -0700
Subject: [PATCH] Built-ins: fix mapping of packDouble2x32 and
unpackDouble2x32.
---
Test/baseResults/400.frag.out | 8 ++++----
glslang/Include/revision.h | 2 +-
glslang/MachineIndependent/Initialize.cpp | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Test/baseResults/400.frag.out b/Test/baseResults/400.frag.out
index b620b144c..a7c9ba49e 100644
--- a/Test/baseResults/400.frag.out
+++ b/Test/baseResults/400.frag.out
@@ -308,11 +308,11 @@ ERROR: node is still EOpNull!
0:95 'u1' (temp uint)
0:99 move second child to first child (temp double)
0:99 'd' (temp double)
-0:99 PackUnorm4x8 (global double)
+0:99 PackDouble2x32 (global double)
0:99 'u2' (temp 2-component vector of uint)
0:100 move second child to first child (temp 2-component vector of uint)
0:100 'u2' (temp 2-component vector of uint)
-0:100 UnpackUnorm4x8 (global 2-component vector of uint)
+0:100 UnpackDouble2x32 (global 2-component vector of uint)
0:100 'd' (temp double)
0:117 Function Definition: interp( (global void)
0:117 Function Parameters:
@@ -797,11 +797,11 @@ ERROR: node is still EOpNull!
0:95 'u1' (temp uint)
0:99 move second child to first child (temp double)
0:99 'd' (temp double)
-0:99 PackUnorm4x8 (global double)
+0:99 PackDouble2x32 (global double)
0:99 'u2' (temp 2-component vector of uint)
0:100 move second child to first child (temp 2-component vector of uint)
0:100 'u2' (temp 2-component vector of uint)
-0:100 UnpackUnorm4x8 (global 2-component vector of uint)
+0:100 UnpackDouble2x32 (global 2-component vector of uint)
0:100 'd' (temp double)
0:117 Function Definition: interp( (global void)
0:117 Function Parameters:
diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index 3d84f80d0..4c5b5cb2b 100644
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
-#define GLSLANG_REVISION "SPIRV99.823"
+#define GLSLANG_REVISION "SPIRV99.824"
#define GLSLANG_DATE "06-Dec-2015"
diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp
index c7f05b5ad..d05a67312 100644
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
@@ -3279,8 +3279,8 @@ void IdentifyBuiltIns(int version, EProfile profile, int spv, EShLanguage langua
symbolTable.relateToOperator("packUnorm4x8", EOpPackUnorm4x8);
symbolTable.relateToOperator("unpackUnorm4x8", EOpUnpackUnorm4x8);
- symbolTable.relateToOperator("packDouble2x32", EOpPackUnorm4x8);
- symbolTable.relateToOperator("unpackDouble2x32", EOpUnpackUnorm4x8);
+ symbolTable.relateToOperator("packDouble2x32", EOpPackDouble2x32);
+ symbolTable.relateToOperator("unpackDouble2x32", EOpUnpackDouble2x32);
symbolTable.relateToOperator("packHalf2x16", EOpPackHalf2x16);
symbolTable.relateToOperator("unpackHalf2x16", EOpUnpackHalf2x16);
--
GitLab