texture.h: Overload decode_wrapmode to support ustringhash (#4207)

For OSL, we want to be able to decode a wrapmode directly from a ustringhash without having to expensively convert it to ustring. Signed-off-by: Chris Hellmuth <[email protected]>
AcademySoftwareFoundation · Mar 28, 2024 · 6179658 · 6179658
1 parent 22ef9b2
commit 6179658
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/src/include/OpenImageIO/texture.h b/src/include/OpenImageIO/texture.h
@@ -26,6 +26,7 @@
 #define OIIO_TEXTURESYSTEM_SUPPORTS_GETATTRIBUTETYPE 1
 
 #define OIIO_TEXTURESYSTEM_SUPPORTS_STOCHASTIC 1
+#define OIIO_TEXTURESYSTEM_SUPPORTS_DECODE_BY_USTRINGHASH 1
 
 #ifndef INCLUDED_IMATHVEC_H
 // Placeholder declaration for Imath::V3f if no Imath headers have been
@@ -93,6 +94,7 @@ enum class Wrap {
 /// "default", "black", "clamp", "periodic", "mirror".
 OIIO_API Wrap decode_wrapmode (const char *name);
 OIIO_API Wrap decode_wrapmode (ustring name);
+OIIO_API Wrap decode_wrapmode (ustringhash name);
 
 /// Utility: Parse a single wrap mode (e.g., "periodic") or a
 /// comma-separated wrap modes string (e.g., "black,clamp") into
@@ -278,6 +280,10 @@ class OIIO_API TextureOpt {
     {
         return (Wrap)Tex::decode_wrapmode(name);
     }
+    static Wrap decode_wrapmode(ustringhash name)
+    {
+        return (Wrap)Tex::decode_wrapmode(name);
+    }
 
     /// Utility: Parse a single wrap mode (e.g., "periodic") or a
     /// comma-separated wrap modes string (e.g., "black,clamp") into
@@ -430,6 +436,10 @@ class OIIO_API TextureOptions {
     {
         return (Wrap)Tex::decode_wrapmode(name);
     }
+    static Wrap decode_wrapmode(ustringhash name)
+    {
+        return (Wrap)Tex::decode_wrapmode(name);
+    }
 
     /// Utility: Parse a single wrap mode (e.g., "periodic") or a
     /// comma-separated wrap modes string (e.g., "black,clamp") into

diff --git a/src/libtexture/texoptions.cpp b/src/libtexture/texoptions.cpp
@@ -36,6 +36,18 @@ static const ustring wrap_type_name[] = {
     ustring()
 };
 
+static const ustringhash wrap_type_hash[] = {
+    // MUST match the order of TextureOptions::Wrap
+    ustringhash("default"),
+    ustringhash("black"),
+    ustringhash("clamp"),
+    ustringhash("periodic"),
+    ustringhash("mirror"),
+    ustringhash("periodic_pow2"),
+    ustringhash("periodic_sharedborder"),
+    ustringhash()
+};
+
 }  // end anonymous namespace
 
 
@@ -143,6 +155,15 @@ Tex::decode_wrapmode(ustring name)
     return Tex::Wrap::Default;
 }
 
+Tex::Wrap
+Tex::decode_wrapmode(ustringhash name)
+{
+    for (int i = 0; i < (int)Tex::Wrap::Last; ++i)
+        if (name == wrap_type_hash[i])
+            return (Wrap)i;
+    return Tex::Wrap::Default;
+}
+
 
 
 void