Move GL pointer string utils from CallLogWrapper to StrUtil.

Move glu array pointer string utilities from gluCallLogWrapper.cpp to
gluStrUtil.hpp.

Change-Id: I21e12d1a81a649539004cef7ec456fb1c9f8d287

diff --git a/framework/opengl/gluCallLogWrapper.cpp b/framework/opengl/gluCallLogWrapper.cpp
index a2fb9ca..92ecf15 100644 (file)
--- a/framework/opengl/gluCallLogWrapper.cpp
+++ b/framework/opengl/gluCallLogWrapper.cpp
@@ -55,16 +55,6 @@ inline tcu::Format::ArrayPointer<T> getPointerStr (const T* arr, int size)
        return tcu::formatArray(arr, de::max(size, 0));
 }
 
-inline detail::EnumPointerFmt getEnumPointerStr (const deUint32* value, glw::GLsizei size, detail::EnumPointerFmt::GetEnumNameFunc getName)
-{
-       return detail::EnumPointerFmt(value, (deUint32)de::max(0, size), getName);
-}
-
-inline detail::BooleanPointerFmt getBooleanPointerStr (const deUint8* value, glw::GLsizei size)
-{
-       return detail::BooleanPointerFmt(value, (deUint32)de::max(0, size));
-}
-
 // String formatter.
 
 class StringFmt

diff --git a/framework/opengl/gluStrUtil.hpp b/framework/opengl/gluStrUtil.hpp
index 57339b4..e7381de 100644 (file)
--- a/framework/opengl/gluStrUtil.hpp
+++ b/framework/opengl/gluStrUtil.hpp
@@ -77,6 +77,16 @@ std::ostream&                operator<<              (std::ostream& str, const EnumPointerFmt& fmt);
 
 } // detail
 
+inline detail::EnumPointerFmt getEnumPointerStr (const deUint32* value, deInt32 size, detail::EnumPointerFmt::GetEnumNameFunc getName)
+{
+       return detail::EnumPointerFmt(value, (deUint32)de::max(0, size), getName);
+}
+
+inline detail::BooleanPointerFmt getBooleanPointerStr (const deUint8* value, deInt32 size)
+{
+       return detail::BooleanPointerFmt(value, (deUint32)de::max(0, size));
+}
+
 inline detail::TextureUnitStr                                          getTextureUnitStr                       (deUint32 unit) { return detail::TextureUnitStr(unit); }
 inline detail::TextureParameterValueStr                                getTextureParameterValueStr     (deUint32 param, int value) { return detail::TextureParameterValueStr(param, value); }
 detail::EnumPointerFmt                                                         getInvalidateAttachmentStr      (const deUint32* attachments, int numAttachments);