OSLQuery improvements (#821)

* OSLQuery::Parameter -- add copy/move constructors

* Make the ShadingSystem side of OSLQuery correctly report default vals.

Author: lgritz

src/include/OSL/oslquery.h

@@ -61,12 +61,12 @@ class OSLQUERYPUBLIC OSLQuery {
     struct Parameter {
         ustring name;                    ///< name
         TypeDesc type;                   ///< data type
-        bool isoutput;                   ///< is it an output param?
-        bool validdefault;               ///< false if there's no default val
-        bool varlenarray;                ///< is it a varying-length array?
-        bool isstruct;                   ///< is it a structure?
-        bool isclosure;                  ///< is it a closure?
-        void *data;                      ///< pointer to data
+        bool isoutput = false;           ///< is it an output param?
+        bool validdefault = false;       ///< false if there's no default val
+        bool varlenarray = false;        ///< is it a varying-length array?
+        bool isstruct = false;           ///< is it a structure?
+        bool isclosure = false;          ///< is it a closure?
+        void *data = nullptr;            ///< pointer to data
         std::vector<int> idefault;       ///< default int values
         std::vector<float> fdefault;     ///< default float values
         std::vector<ustring> sdefault;   ///< default string values
@@ -75,10 +75,10 @@ class OSLQUERYPUBLIC OSLQuery {
         std::vector<ustring> fields;     ///< Names of this struct's fields
         ustring structname;              ///< Name of the struct
         std::vector<Parameter> metadata; ///< Meta-data about the param
-        Parameter ()
-            : isoutput(false), validdefault(false), varlenarray(false),
-              isstruct(false), isclosure(false), data(NULL)
-        { }
+
+        Parameter () {}
+        Parameter (const Parameter& src);
+        Parameter (Parameter&& src);
     };
 
     OSLQuery ();

src/include/osl_pvt.h

@@ -699,21 +699,21 @@ class Symbol {
     bool is_temp () const { return symtype() == SymTypeTemp; }
 
     // Retrieve the const float value (will ASSERT if not a const float!)
-    float get_float (int index = 0) {
+    float get_float (int index = 0) const {
         ASSERT (data() && typespec().is_float_based());
         return ((const float *)data())[index];
     }
 
     // Retrieve the const int value (will ASSERT if not a const int!)
-    int get_int (int index = 0) {
+    int get_int (int index = 0) const {
         ASSERT (data() && typespec().is_int_based());
         return ((const int *)data())[index];
     }
 
     // Retrieve the const string value (will ASSERT if not a const string!)
-    ustring get_string () {
+    ustring get_string (int index = 0) const {
         ASSERT (data() && typespec().is_string());
-        return ((const ustring *)data())[0];
+        return ((const ustring *)data())[index];
     }
 
     /// Stream output

src/liboslexec/shadingsys.cpp

@@ -3102,6 +3102,19 @@ OSL::OSLQuery::init (const ShaderGroup *group, int layernum)
             p.fdefault.clear();
             p.sdefault.clear();
             p.spacename.clear();
+            int n = int (p.type.numelements() * p.type.aggregate);
+            if (p.type.basetype == TypeDesc::INT) {
+                for (int i = 0; i < n; ++i)
+                    p.idefault.push_back (sym->get_int(i));
+            }
+            if (p.type.basetype == TypeDesc::FLOAT) {
+                for (int i = 0; i < n; ++i)
+                    p.fdefault.push_back (sym->get_float(i));
+            }
+            if (p.type.basetype == TypeDesc::STRING) {
+                for (int i = 0; i < n; ++i)
+                    p.sdefault.push_back (sym->get_string(i));
+            }
             p.fields.clear();  // don't bother filling this out
             if (StructSpec *ss = ts.structspec()) {
                 p.structname = ss->name().string();

src/liboslquery/oslquery.cpp

@@ -267,6 +267,43 @@ OSOReaderQuery::codemarker (const char *name)
 
 
 
+OSLQuery::Parameter::Parameter (const Parameter& src)
+    : name(src.name), type(src.type), isoutput(src.isoutput),
+      validdefault(src.validdefault), varlenarray(src.varlenarray),
+      isstruct(src.isstruct), isclosure(src.isclosure),
+      idefault(src.idefault), fdefault(src.fdefault),
+      sdefault(src.sdefault), spacename(src.spacename),
+      fields(src.fields), structname(src.structname),
+      metadata(src.metadata)
+{
+    if (type.basetype == TypeDesc::INT)
+        data = idefault.data();
+    else if (type.basetype == TypeDesc::FLOAT)
+        data = fdefault.data();
+    else if (type.basetype == TypeDesc::STRING)
+        data = sdefault.data();
+}
+
+
+
+OSLQuery::Parameter::Parameter (Parameter&& src)
+    : name(src.name), type(src.type), isoutput(src.isoutput),
+      validdefault(src.validdefault), varlenarray(src.varlenarray),
+      isstruct(src.isstruct), isclosure(src.isclosure),
+      idefault(src.idefault), fdefault(src.fdefault),
+      sdefault(src.sdefault), spacename(src.spacename),
+      fields(src.fields), structname(src.structname),
+      metadata(src.metadata)
+{
+    if (type.basetype == TypeDesc::INT)
+        data = idefault.data();
+    else if (type.basetype == TypeDesc::FLOAT)
+        data = fdefault.data();
+    else if (type.basetype == TypeDesc::STRING)
+        data = sdefault.data();
+}
+
+
 
 OSLQuery::OSLQuery ()
 {