Prevent incorrect usage of de::getSizedArrayElement.

- Prevent usage without <..._LAST> template argument.
- Preserve old usage as de::getArrayElement.

Change-Id: I1ab7cf128ebe8b1805f2fc4ac062dc8f6cc7e859

diff --git a/framework/delibs/decpp/deDefs.hpp b/framework/delibs/decpp/deDefs.hpp
index 88ba2f6279fc51282b4981708021b60d3862a2eb..e07af19d657bfcecb6d7459bd8f274e40e35ba59 100644 (file)
--- a/framework/delibs/decpp/deDefs.hpp
+++ b/framework/delibs/decpp/deDefs.hpp
@@ -71,9 +71,29 @@ template<typename T> struct ArrayDeleter
        inline void operator() (T* ptr) const { delete[] ptr; }
 };
 
+template <typename T, bool Cond>
+struct EnableIf
+{
+};
+
+
+template <typename T>
+struct EnableIf<T, true>
+{
+       typedef T Type;
+};
+
 //! Get an element of an array with a specified size.
+template <int LastElementIndex, int Size, typename Elem>
+const Elem& getSizedArrayElement (const Elem (&array)[Size], typename de::EnableIf<int, LastElementIndex==Size>::Type offset)
+{
+       DE_ASSERT(inBounds(offset, 0, Size));
+       return array[offset];
+}
+
+//! Get an element of an array with a compile-time constant size.
 template <int Size, typename Elem>
-const Elem& getSizedArrayElement(const Elem (&array)[Size], int offset)
+const Elem& getArrayElement (const Elem (&array)[Size], int offset)
 {
        DE_ASSERT(inBounds(offset, 0, Size));
        return array[offset];

diff --git a/modules/gles31/functional/es31fCopyImageTests.cpp b/modules/gles31/functional/es31fCopyImageTests.cpp
index 2700acefd48100e77029ad92727b0ac7c0244134..bb187b1acbe8496567c48ca4195ec8a868a046db 100644 (file)
--- a/modules/gles31/functional/es31fCopyImageTests.cpp
+++ b/modules/gles31/functional/es31fCopyImageTests.cpp
@@ -502,7 +502,7 @@ deUint32 mapFaceNdxToFace (int ndx)
                GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
        };
 
-       return de::getSizedArrayElement(cubeFaces, ndx);
+       return de::getSizedArrayElement<6>(cubeFaces, ndx);
 }
 
 deUint32 getFormatForInternalFormat (deUint32 format)

diff --git a/modules/glshared/glsBuiltinPrecisionTests.cpp b/modules/glshared/glsBuiltinPrecisionTests.cpp
index cb11004c816fdf53e69dfd870a251627346c9e1f..eeef119c3296e0b3fc63f593888166c4bb3062c9 100644 (file)
--- a/modules/glshared/glsBuiltinPrecisionTests.cpp
+++ b/modules/glshared/glsBuiltinPrecisionTests.cpp
@@ -5191,9 +5191,9 @@ TestCaseGroup* createFuncGroup (const PrecisionTestContext&       ctx,
        {
                const Precision         precision       = Precision(precNdx);
                const string            precName        (glu::getPrecisionName(precision));
-               const FloatFormat&      fmt                     = *de::getSizedArrayElement(ctx.formats, precNdx);
-               const FloatFormat&      highpFmt        = *de::getSizedArrayElement(ctx.formats,
-                                                                                                                                       glu::PRECISION_HIGHP);
+               const FloatFormat&      fmt                     = *de::getSizedArrayElement<glu::PRECISION_LAST>(ctx.formats, precNdx);
+               const FloatFormat&      highpFmt        = *de::getSizedArrayElement<glu::PRECISION_LAST>(ctx.formats,
+                                                                                                                                                                                glu::PRECISION_HIGHP);
 
                for (size_t shaderNdx = 0; shaderNdx < ctx.shaderTypes.size(); ++shaderNdx)
                {