Fix compilation - fix Wunused-parameter warning

The indexMatrixRow parameter of getBaseOffset function
was always 0 and not used. Remove it, move assert to the caller.

Affects: dEQP-VK.spirv_assembly.instruction.*.variable_pointers.*

Components: Vulkan
VK-GL-CTS issue: 555

Change-Id: I9f640a28181617a930ce535132143889fcbc5247

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp
index ba2bcef..926a6da 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp
@@ -99,15 +99,12 @@ void fillRandomScalars (de::Random& rnd, T minValue, T maxValue, void* dst, int
 //
 // This method finds the correct offset from the base of a vector<float32> given the indexes into the structure.
 // Returns the index in the inclusive range of 0 and 63. Each unit of the offset represents offset by the size of a 32-bit float.
-deUint32 getBaseOffset(        deUint32 indexOuterStruct,
-                                               deUint32 indexMatrixRow,
+deUint32 getBaseOffset (deUint32 indexMatrixRow,
                                                deUint32 indexMatrixCol,
                                                deUint32 indexInnerStruct,
                                                deUint32 indexVec4Array,
                                                deUint32 indexVec4)
 {
-       // index into the outer structure must be zero since the outer structure has only 1 member.
-       DE_ASSERT(indexOuterStruct == 0);
        DE_ASSERT(indexMatrixRow < 2);
        DE_ASSERT(indexMatrixCol < 2);
        DE_ASSERT(indexInnerStruct < 2);
@@ -152,7 +149,7 @@ deUint32 getBaseOffset(     deUint32 indexOuterStruct,
 //
 // This method finds the correct offset from the base of a vector<float32> given the indexes into the structure.
 // Returns the index in the inclusive range of 0 and 127.
-deUint32 getBaseOffsetForSingleInputBuffer(    deUint32 indexOuterStruct,
+deUint32 getBaseOffsetForSingleInputBuffer (deUint32 indexOuterStruct,
                                                                                        deUint32 indexMatrixRow,
                                                                                        deUint32 indexMatrixCol,
                                                                                        deUint32 indexInnerStruct,
@@ -166,8 +163,8 @@ deUint32 getBaseOffsetForSingleInputBuffer( deUint32 indexOuterStruct,
        DE_ASSERT(indexVec4Array < 2);
        DE_ASSERT(indexVec4 < 4);
 
-       // Get the offset assuming you have only one outer_struct. (use index 0 for outer_struct)
-       deUint32 offset = getBaseOffset(0, indexMatrixRow, indexMatrixCol, indexInnerStruct, indexVec4Array, indexVec4);
+       // Get the offset assuming you have only one outer_struct.
+       deUint32 offset = getBaseOffset(indexMatrixRow, indexMatrixCol, indexInnerStruct, indexVec4Array, indexVec4);
 
        // If the second outer structure (b) is chosen in the input_buffer, we need to add an offset of 64 since
        // each outer_struct contains 64 floats.
@@ -1843,8 +1840,10 @@ void addTwoInputBufferReadOnlyVariablePointersGraphicsGroup (tcu::TestCaseGroup*
 
                for (int indexLevel = 0; indexLevel < numLevels; ++indexLevel)
                {
-                       baseOffset                                              = getBaseOffset(indexesForLevel[indexLevel][0],
-                                                                                                                       indexesForLevel[indexLevel][1],
+                       // index into the outer structure must be zero since the outer structure has only 1 member.
+                       DE_ASSERT(indexesForLevel[indexLevel][0] == 0);
+
+                       baseOffset                                              = getBaseOffset(indexesForLevel[indexLevel][1],
                                                                                                                        indexesForLevel[indexLevel][2],
                                                                                                                        indexesForLevel[indexLevel][3],
                                                                                                                        indexesForLevel[indexLevel][4],