From c69c963bc56c550b607e7bf1c4d4c96203ee8984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Mon, 21 Mar 2016 21:23:59 -0700
Subject: [PATCH] Cleanup.

---
 src/shader_spirv.cpp | 18 +++++++++---------
 src/shader_spirv.h   |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/shader_spirv.cpp b/src/shader_spirv.cpp
index fd043caae..a5809ae6c 100644
--- a/src/shader_spirv.cpp
+++ b/src/shader_spirv.cpp
@@ -921,7 +921,7 @@ namespace bgfx
 			break;
 
 		default:
-			size += bx::read(_reader, _operand.data[0], _err);
+			size += bx::read(_reader, _operand.data, _err);
 			break;
 		}
 
@@ -1047,7 +1047,7 @@ namespace bgfx
 				size += bx::snprintf(&_out[size], bx::uint32_imax(0, _size-size)
 							, "%sAddressingModel(%d)"
 							, 0 == ii ? " " : ", "
-							, operand.data[0]
+							, operand.data
 							);
 				break;
 
@@ -1055,7 +1055,7 @@ namespace bgfx
 				size += bx::snprintf(&_out[size], bx::uint32_imax(0, _size-size)
 							, "%s%s"
 							, 0 == ii ? " " : ", "
-							, getName(SpvDecoration::Enum(operand.data[0]) )
+							, getName(SpvDecoration::Enum(operand.data) )
 							);
 				break;
 
@@ -1063,7 +1063,7 @@ namespace bgfx
 				size += bx::snprintf(&_out[size], bx::uint32_imax(0, _size-size)
 							, "%s0x%08x"
 							, 0 == ii ? " " : ", "
-							, operand.data[0]
+							, operand.data
 							);
 				break;
 
@@ -1071,7 +1071,7 @@ namespace bgfx
 				size += bx::snprintf(&_out[size], bx::uint32_imax(0, _size-size)
 							, "%s%d"
 							, 0 == ii ? " " : ", "
-							, operand.data[0]
+							, operand.data
 							);
 				break;
 
@@ -1087,7 +1087,7 @@ namespace bgfx
 				size += bx::snprintf(&_out[size], bx::uint32_imax(0, _size-size)
 							, "%sMemoryModel(%d)"
 							, 0 == ii ? " " : ", "
-							, operand.data[0]
+							, operand.data
 							);
 				break;
 
@@ -1095,7 +1095,7 @@ namespace bgfx
 				size += bx::snprintf(&_out[size], bx::uint32_imax(0, _size-size)
 							, "%s%s"
 							, 0 == ii ? " " : ", "
-							, getName(SpvStorageClass::Enum(operand.data[0]) )
+							, getName(SpvStorageClass::Enum(operand.data) )
 							);
 				break;
 
@@ -1103,7 +1103,7 @@ namespace bgfx
 				size += bx::snprintf(&_out[size], bx::uint32_imax(0, _size-size)
 							, "%s__%d__"
 							, 0 == ii ? " " : ", "
-							, operand.data[0]
+							, operand.data
 							);
 				break;
 
@@ -1111,7 +1111,7 @@ namespace bgfx
 				size += bx::snprintf(&_out[size], bx::uint32_imax(0, _size-size)
 							, "%sr%d"
 							, 0 == ii ? " " : ", "
-							, operand.data[0]
+							, operand.data
 							);
 				break;
 
diff --git a/src/shader_spirv.h b/src/shader_spirv.h
index 5c7a983f6..6036ba7f8 100644
--- a/src/shader_spirv.h
+++ b/src/shader_spirv.h
@@ -581,9 +581,8 @@ namespace bgfx
 		};
 
 		Enum type;
-		uint32_t data[4];
+		uint32_t data;
 
-		uint32_t target;
 		stl::string literalString;
 	};