Merge "Fix warnings in texture_filtering tests"

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
index f5a9886..15ab678 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktSampleVerifier.cpp
@@ -67,6 +67,9 @@ bool isEqualRelEpsilon (const Vector<float, Size>& a, const Vector<float, Size>&
 
 float calcRelEpsilon (VkFormat format, VkFilter filter, VkSamplerMipmapMode mipmapFilter)
 {
+       // This should take into account the format at some point, but doesn't now
+       DE_UNREF(format);
+
        // fp16 format approximates the minimum precision for internal calculations mandated by spec
        const float fp16MachineEpsilon = 0.0009765625f;
 
@@ -113,7 +116,7 @@ Vector<float, Size> floor (const Vector<float, Size>& v)
 
        for (int compNdx = 0; compNdx < Size; ++compNdx)
        {
-               result[compNdx] = deFloor(v[compNdx]);
+               result[compNdx] = (float)deFloor(v[compNdx]);
        }
 
        return result;
@@ -126,7 +129,7 @@ Vector<float, Size> ceil (const Vector<float, Size>& v)
 
        for (int compNdx = 0; compNdx < Size; ++compNdx)
        {
-               result[compNdx] = deCeil(v[compNdx]);
+               result[compNdx] = (float)deCeil(v[compNdx]);
        }
 
        return result;
@@ -1070,6 +1073,9 @@ bool SampleVerifier::verifySampleCubemapFace (const SampleArguments&      args,
                                                                                          deUint8                                       face,
                                                                                          std::ostream&                         report) const
 {
+       // Will use this parameter once cubemapping is implemented completely
+       DE_UNREF(face);
+
        Vec2 lodBounds;
 
        if (m_sampleLookupSettings.lookupLodMode == LOOKUP_LOD_MODE_DERIVATIVES)

diff --git a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp b/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp
index e663f10..ec93f90 100644 (file)
--- a/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp
+++ b/external/vulkancts/modules/vulkan/texture_filtering/vktTextureFilteringExplicitLodTests.cpp
@@ -975,7 +975,6 @@ public:
                                                           VkSamplerAddressMode wrappingMode)
 
                : TextureFilteringTestCase      (testCtx, name, desc)
-               , m_testCtx                                     (testCtx)
                , m_format                                      (format)
                , m_dimensions                          (dimensions)
                , m_magFilter                           (magFilter)
@@ -1047,7 +1046,6 @@ protected:
        }
 
 private:
-       TestContext&                                    m_testCtx;
        TextureFormat                                   m_format;
        IVec3                                                   m_dimensions;
        VkFilter                                                m_magFilter;