Use array for shaderResourceLoaded

Change-Id: Ib43984d51c76fd540d66ff9b09326da4b32084cc

Author: fftzeng

IGC/Compiler/CISACodeGen/CShader.cpp

@@ -66,7 +66,10 @@ CShader::CShader(Function* pFunc, CShaderProgram* pProgram)
     m_constantBufferMask = 0;
     m_constantBufferLoaded = 0;
     m_uavLoaded = 0;
-    m_shaderResourceLoaded = 0;
+    for (int i = 0; i < 4; i++)
+    {
+        m_shaderResourceLoaded[i] = 0;
+    }
     m_renderTargetLoaded = 0;
     isInputsPulled = false;
     m_cbSlot = -1;

IGC/Compiler/CISACodeGen/ComputeShaderCodeGen.cpp

@@ -289,7 +289,10 @@ namespace IGC
 
         pKernelProgram->ConstantBufferLoaded = m_constantBufferLoaded;
         pKernelProgram->UavLoaded = m_uavLoaded;
-        pKernelProgram->ShaderResourceLoaded = m_shaderResourceLoaded;
+        for (int i = 0; i < 4; i++)
+        {
+            pKernelProgram->ShaderResourceLoaded[i] = m_shaderResourceLoaded[i];
+        }
         pKernelProgram->RenderTargetLoaded = m_renderTargetLoaded;
 
         pKernelProgram->hasControlFlow = m_numBlocks > 1 ? true : false;

IGC/Compiler/CISACodeGen/DomainShaderCodeGen.cpp

@@ -277,7 +277,10 @@ namespace IGC
         pKernelProgram->VertexURBEntryOutputReadOffset = GetURBHeaderSize();
         pKernelProgram->ConstantBufferLoaded = m_constantBufferLoaded;
         pKernelProgram->UavLoaded = m_uavLoaded;
-        pKernelProgram->ShaderResourceLoaded = m_shaderResourceLoaded;
+        for (int i = 0; i < 4; i++)
+        {
+            pKernelProgram->ShaderResourceLoaded[i] = m_shaderResourceLoaded[i];
+        }
         pKernelProgram->RenderTargetLoaded = m_renderTargetLoaded;
 
         pKernelProgram->DeclaresRTAIndex = m_properties.m_isRTAIndexDeclared;

IGC/Compiler/CISACodeGen/GeometryShaderCodeGen.cpp

@@ -351,7 +351,10 @@ namespace IGC
 
         pKernelProgram->ConstantBufferLoaded = m_constantBufferLoaded;
         pKernelProgram->UavLoaded = m_uavLoaded;
-        pKernelProgram->ShaderResourceLoaded = m_shaderResourceLoaded;
+        for (int i = 0; i < 4; i++)
+        {
+            pKernelProgram->ShaderResourceLoaded[i] = m_shaderResourceLoaded[i];
+        }
         pKernelProgram->RenderTargetLoaded = m_renderTargetLoaded;
 
         pKernelProgram->NOSBufferSize = m_NOSBufferSize / getGRFSize(); // in 256 bits

IGC/Compiler/CISACodeGen/HullShaderCodeGen.cpp

@@ -278,7 +278,10 @@ namespace IGC
 
         pKernelProgram->ConstantBufferLoaded = m_constantBufferLoaded;
         pKernelProgram->UavLoaded = m_uavLoaded;
-        pKernelProgram->ShaderResourceLoaded = m_shaderResourceLoaded;
+        for (int i = 0; i < 4; i++)
+        {
+            pKernelProgram->ShaderResourceLoaded[i] = m_shaderResourceLoaded[i];
+        }
         pKernelProgram->RenderTargetLoaded = m_renderTargetLoaded;
 
         pKernelProgram->NOSBufferSize = m_NOSBufferSize / getGRFSize(); // in 256 bits

IGC/Compiler/CISACodeGen/PixelShaderCodeGen.cpp

@@ -718,7 +718,10 @@ namespace IGC
         pKernelProgram->hasZWDelta = m_ZWDelta;
         pKernelProgram->ConstantBufferLoaded = m_constantBufferLoaded;
         pKernelProgram->UavLoaded = m_uavLoaded;
-        pKernelProgram->ShaderResourceLoaded = m_shaderResourceLoaded;
+        for (int i = 0; i < 4; i++)
+        {
+            pKernelProgram->ShaderResourceLoaded[i] = m_shaderResourceLoaded[i];
+        }
         pKernelProgram->RenderTargetLoaded = m_renderTargetLoaded;
 
         pKernelProgram->hasControlFlow = m_numBlocks > 1 ? true : false;

IGC/Compiler/CISACodeGen/ShaderCodeGen.hpp

@@ -337,7 +337,7 @@ namespace IGC
 
                     if (bufType == RESOURCE)
                     {
-                        m_shaderResourceLoaded |= (uint64_t)1 << typeBti;
+                        m_shaderResourceLoaded[typeBti / 32] |= BIT(typeBti % 32);
                     }
                     else if (bufType == CONSTANT_BUFFER)
                     {
@@ -360,7 +360,16 @@ namespace IGC
 
                     if (bufType == RESOURCE)
                     {
-                        m_shaderResourceLoaded |= QWBITMASK_RANGE(0, m_pBtiLayout->GetTextureIndexSize());
+                        unsigned int MaxArray = m_pBtiLayout->GetTextureIndexSize() / 32;
+                        for (unsigned int i = 0; i < MaxArray; i++)
+                        {
+                            m_shaderResourceLoaded[i] = 0xffffffff;
+                        }
+
+                        for (unsigned int i = MaxArray * 32; i < m_pBtiLayout->GetTextureIndexSize(); i++)
+                        {
+                            m_shaderResourceLoaded[MaxArray] = BIT(i % 32);
+                        }
                     }
                     else if (bufType == CONSTANT_BUFFER)
                     {
@@ -490,7 +499,7 @@ namespace IGC
         uint m_constantBufferMask;
         uint m_constantBufferLoaded;
         uint m_uavLoaded;
-        uint64_t m_shaderResourceLoaded;
+        uint m_shaderResourceLoaded[4];
         uint m_renderTargetLoaded;
 
         int  m_cbSlot;

IGC/Compiler/CISACodeGen/VertexShaderCodeGen.cpp

@@ -174,7 +174,10 @@ namespace IGC
         pKernelProgram->MaxNumberOfThreads = m_Platform->getMaxVertexShaderThreads(isPositionOnlyShader);
         pKernelProgram->ConstantBufferLoaded = m_constantBufferLoaded;
         pKernelProgram->UavLoaded = m_uavLoaded;
-        pKernelProgram->ShaderResourceLoaded = m_shaderResourceLoaded;
+        for (unsigned int i = 0; i < 4; i++)
+        {
+            pKernelProgram->ShaderResourceLoaded[i] = m_shaderResourceLoaded[i];
+        }
         pKernelProgram->RenderTargetLoaded = m_renderTargetLoaded;
 
         pKernelProgram->hasVertexID = m_properties.m_HasVertexID;

IGC/Compiler/CodeGenPublic.h

@@ -264,7 +264,7 @@ namespace IGC
         unsigned int NOSBufferSize = 0;
         unsigned int ConstantBufferLoaded = 0;
         unsigned int UavLoaded = 0;
-        uint64_t ShaderResourceLoaded = 0;
+        unsigned int ShaderResourceLoaded[4];
         unsigned int RenderTargetLoaded = 0;
 
         bool         hasControlFlow = false;