Expose optional "anisotropic" parameter to the texture funtions in OSL.

CMakeLists.txt

@@ -288,7 +288,8 @@ TESTSUITE ( and-or-not-synonyms aastep arithmetic array array-derivs array-range
             struct-nested struct-nested-assign struct-nested-deep
             ternary
             testshade-expr
-            texture-alpha texture-blur texture-connected-options
+            texture-alpha texture-aniso
+            texture-blur texture-connected-options
             texture-derivs texture-errormsg
             texture-firstchannel texture-interp
             texture-missingcolor texture-simple

src/doc/languagespec.tex

@@ -4135,6 +4135,16 @@ \section{Texture}
 \apiend
 \vspace{-16pt}
 
+\apiitem{"anisotropic", <int>}
+\vspace{12pt}
+Sets the maximum anisotropic ratio allowed. This parameter may not be
+supported by all renderers, and may have different default values (it is
+supported with a default of 32 for renderers that use OpenImageIO's texture
+system).
+\NEW % 1.10
+\apiend
+\vspace{-16pt}
+
 \apiend
 
 \apiitem{\emph{type} \textbf{texture3d} (string filename, point p, \pl) \\

src/liboslexec/builtindecl.h

@@ -381,6 +381,7 @@ DECL (osl_texture_set_fill, "xXf")
 DECL (osl_texture_set_time, "xXf")
 DECL (osl_texture_set_interp, "xXs")
 DECL (osl_texture_set_interp_code, "xXi")
+DECL (osl_texture_set_anisotropic, "xXi")
 DECL (osl_texture_set_subimage, "xXi")
 DECL (osl_texture_set_subimagename, "xXs")
 DECL (osl_texture_set_missingcolor_arena, "xXX")

src/liboslexec/llvm_gen.cpp

@@ -2082,7 +2082,7 @@ llvm_gen_texture_options (BackendLLVM &rop, int opnum,
     bool sblur_set = false, tblur_set = false, rblur_set = false;
     bool swrap_set = false, twrap_set = false, rwrap_set = false;
     bool firstchannel_set = false, fill_set = false, interp_set = false;
-    bool time_set = false, subimage_set = false;
+    bool time_set = false, subimage_set = false, anisotropic_set = false;
 
     Opcode &op (rop.inst()->ops()[opnum]);
     for (int a = first_optional_arg;  a < op.nargs();  ++a) {
@@ -2196,6 +2196,7 @@ llvm_gen_texture_options (BackendLLVM &rop, int opnum,
 
         PARAM_FLOAT (fill)
         PARAM_FLOAT (time)
+        PARAM_INT (anisotropic)
         PARAM_INT (firstchannel)
         PARAM_INT (subimage)
 

src/liboslexec/optexture.cpp

@@ -180,6 +180,14 @@ osl_texture_set_time (void *opt, float x)
     ((TextureOpt *)opt)->time = x;
 }
 
+OSL_SHADEOP void
+osl_texture_set_anisotropic (void *opt, int x)
+{
+    ((TextureOpt *)opt)->anisotropic = x;
+}
+
+
+
 inline int
 tex_interp_to_code (ustring modename)
 {

testsuite/texture-aniso/ref/out.txt

@@ -0,0 +1,3 @@
+Compiled test.osl -> test.oso
+
+Output Cout to out.tif

testsuite/texture-aniso/run.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+command += testshade("-g 128 128 --center -od uint8 -o Cout out.tif test")
+outputs = [ "out.txt", "out.tif" ]

testsuite/texture-aniso/test.osl

@@ -0,0 +1,18 @@
+shader
+test (string texturename = "../common/textures/mandrill.tif",
+      float swirl = 16,
+      output color Cout = 0)
+{
+    int aniso = (u >= v) ? 2 : 256;
+
+    float s1 = -1 + 2*u;
+    float t1 = -1 + 2*v;
+
+    float r = hypot (s1, t1);
+
+    float s1Rot = s1*cos(swirl*r) - t1*sin(swirl*r);
+    float t1Rot = s1*sin(swirl*r) + t1*cos(swirl*r);
+    Cout = (color) texture(texturename, s1Rot, t1Rot,
+                           "wrap", "periodic",
+                           "anisotropic", aniso);
+}