From 8492f0501e60ebc15b159c13db73968165390024 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Mon, 8 Oct 2018 09:22:58 +0200
Subject: [PATCH] [dxbc] Drop unused major/minor from DxbcProgramVersion

---
 src/dxbc/dxbc_chunk_shex.cpp |  6 +++---
 src/dxbc/dxbc_common.h       | 30 +++++-------------------------
 src/dxbc/dxbc_module.h       |  4 ++--
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/dxbc/dxbc_chunk_shex.cpp b/src/dxbc/dxbc_chunk_shex.cpp
index 708391de..9e68f24a 100644
--- a/src/dxbc/dxbc_chunk_shex.cpp
+++ b/src/dxbc/dxbc_chunk_shex.cpp
@@ -6,9 +6,9 @@ namespace dxvk {
     // The shader version and type are stored in a 32-bit unit,
     // where the first byte contains the major and minor version
     // numbers, and the high word contains the program type.
-    auto pVersion = reader.readu16() & 0xFF;
+    reader.skip(2);
     auto pType    = reader.readEnum<DxbcProgramType>();
-    m_version = DxbcProgramVersion(pVersion >> 4, pVersion & 0xF, pType);
+    m_version = DxbcProgramVersion(pType);
     
     // Read the actual shader code as an array of DWORDs.
     auto codeLength = reader.readu32() - 2;
@@ -21,4 +21,4 @@ namespace dxvk {
     
   }
   
-}
\ No newline at end of file
+}
diff --git a/src/dxbc/dxbc_common.h b/src/dxbc/dxbc_common.h
index 447065e4..294065e3 100644
--- a/src/dxbc/dxbc_common.h
+++ b/src/dxbc/dxbc_common.h
@@ -21,35 +21,17 @@ namespace dxvk {
   
   
   /**
-   * \brief DXBC shader version info
+   * \brief DXBC shader info
    * 
-   * Stores the shader model version
-   * as well as the program type.
+   * Stores the shader program type.
    */
   class DxbcProgramVersion {
     
   public:
     
     DxbcProgramVersion() { }
-    DxbcProgramVersion(
-      uint8_t major, uint8_t minor, DxbcProgramType type)
-    : m_major(major), m_minor(minor), m_type(type) { }
-    
-    /**
-     * \brief Major version
-     * \returns Major version
-     */
-    uint32_t major() const {
-      return m_major;
-    }
-    
-    /**
-     * \brief Minor version
-     * \returns Minor version
-     */
-    uint32_t minor() const {
-      return m_minor;
-    }
+    DxbcProgramVersion(DxbcProgramType type)
+    : m_type(type) { }
     
     /**
      * \brief Program type
@@ -79,10 +61,8 @@ namespace dxvk {
     
   private:
     
-    uint8_t         m_major = 0;
-    uint8_t         m_minor = 0;
     DxbcProgramType m_type  = DxbcProgramType::PixelShader;
     
   };
   
-}
\ No newline at end of file
+}
diff --git a/src/dxbc/dxbc_module.h b/src/dxbc/dxbc_module.h
index 2fd15800..6b677217 100644
--- a/src/dxbc/dxbc_module.h
+++ b/src/dxbc/dxbc_module.h
@@ -32,8 +32,8 @@ namespace dxvk {
     ~DxbcModule();
     
     /**
-     * \brief Shader type and version
-     * \returns Shader type and version
+     * \brief Shader type
+     * \returns Shader type
      */
     DxbcProgramVersion version() const {
       return m_shexChunk->version();