Updates to KHR_technique_webgl extension spec

extensions/2.0/Khronos/KHR_technique_webgl/schema/glTF.KHR_technique_webgl.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema" : "http://json-schema.org/draft-04/schema",
-  "title" : "KHR_technique_webgl glTF extension",
+  "title" : "KHR_techniques_webgl glTF extension",
   "type" : "object",
   "properties" : {
     "shaders" : {

extensions/2.0/Khronos/KHR_technique_webgl/schema/program.schema.json

@@ -25,6 +25,17 @@
             "description" : "The index of the vertex shader."
         },
         "name" : {},
+        "glExtensions" : {
+            "type" : "array",
+            "description" : "Names of WebGL 1.0 extensions to enable.",
+            "items" : {
+                "type" : "string",
+                "minLength" : 1,
+                "maxLength" : 256
+            },
+            "default" : [],
+            "gltf_webgl" : "`getExtension()`"
+        },
         "extensions" : {},
         "extras" : {}
     },

extensions/2.0/Khronos/KHR_technique_webgl/schema/shader.schema.json

@@ -2,7 +2,7 @@
     "$schema" : "http://json-schema.org/draft-04/schema",
     "title" : "shader",
     "type" : "object",
-    "description" : "A vertex or fragment shader.",
+    "description" : "A vertex or fragment shader. Exactly one of `uri` or `bufferView` must be provided.",
     "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ],
     "properties" : {
         "uri" : {

extensions/2.0/Khronos/KHR_technique_webgl/schema/technique.attribute.schema.json

@@ -1,6 +1,25 @@
 {
     "$schema" : "http://json-schema.org/draft-04/schema",
     "title" : "attribute",
-    "allOf" : [ { "$ref" : "glTFid.schema.json" } ],
-    "description" : "A dictionary object of strings that maps GLSL attribute names to technique parameter IDs."
+    "type" : "object",
+    "description" : "An attribute input to a technique, and an optional semantic.",
+    "allOf" : [ { "$ref" : "glTFProperty.schema.json" } ],
+    "properties" : {
+        "type" : {
+            "type" : "integer",
+            "description" : "The datatype.",
+            "enum" : [5120, 5121, 5122, 5123, 5124, 5125, 5126, 35664, 35665, 35666, 35667, 35668, 35669, 35670, 35671, 35672, 35673, 35674, 35675, 35676, 35678],
+            "gltf_enumNames" : ["BYTE", "UNSIGNED_BYTE", "SHORT", "UNSIGNED_SHORT", "INT", "UNSIGNED_INT", "FLOAT", "FLOAT_VEC2", "FLOAT_VEC3", "FLOAT_VEC4", "INT_VEC2", "INT_VEC3", "INT_VEC4", "BOOL", "BOOL_VEC2", "BOOL_VEC3", "BOOL_VEC4", "FLOAT_MAT2", "FLOAT_MAT3", "FLOAT_MAT4", "SAMPLER_2D"],
+            "gltf_detailedDescription" : "The datatype.  All valid values correspond to WebGL enums."
+        },
+        "semantic" : {
+            "type" : "string",
+            "description" : "Identifies a parameter with a well-known meaning.",
+            "gltf_detailedDescription" : "Identifies a parameter with a well-known meaning.  Attribute semantics include `\"POSITION\"`, `\"NORMAL\"`, `\"TEXCOORD\"`, `\"COLOR\"`, `\"JOINT\"`, and `\"WEIGHT\"`.  `\"TEXCOORD\"` and `\"COLOR\"` attribute semantic property names must be of the form `[semantic]_[set_index]`, e.g., `\"TEXCOORD_0\"`, `\"TEXCOORD_1\"`, `\"COLOR_1\"`, etc.  For forward-compatibility, application-specific semantics must start with an underscore, e.g., \"_SIMULATION_TIME\"."
+        },
+        "extensions" : {},
+        "extras" : {}
+    },
+    "additionalProperties" : false,
+    "required" : ["type", "semantic"]
 }

extensions/2.0/Khronos/KHR_technique_webgl/schema/technique.schema.json

@@ -5,47 +5,31 @@
     "description" : "A template for material appearances.",
     "allOf" : [ { "$ref" : "glTFChildOfRootProperty.schema.json" } ],
     "properties": {
-        "parameters" : {
-            "type" : "object",
-            "description" : "A dictionary object of technique.parameters objects.",
-            "properties" : {
-            },
-            "additionalProperties" : {
-                "$ref" : "technique.parameters.schema.json"
-            },
-            "default" : {},
-            "gltf_detailedDescription" : "A dictionary object of technique.parameters objects.  Each parameter defines an attribute or uniform input, and an optional semantic and value.  Each parameter must be referenced by the attributes or uniforms dictionary properties."
-        },
         "attributes" : {
             "type" : "object",
-            "description" : "A dictionary object of strings that maps GLSL attribute names to technique parameter IDs.",
+            "description" : "A dictionary object of technique.attribute objects.",
             "properties" : {
             },
             "additionalProperties" : {
                 "$ref" : "technique.attribute.schema.json"
             },
             "default" : {},
-            "gltf_detailedDescription" : "A dictionary object of strings that maps GLSL attribute names to technique parameter IDs.  Each string must also be in the parameters dictionary object."
+            "gltf_detailedDescription" : "A dictionary object of technique.attribute objects.  Each object defines an attribute input with a type and a semantic."
         },
         "program" : {
             "allOf" : [ { "$ref" : "glTFid.schema.json" } ],
             "description" : "The index of the program."
         },
         "uniforms" : {
             "type" : "object",
-            "description" : "A dictionary object of strings that maps GLSL uniform names to technique parameter IDs.",
+            "description" : "A dictionary object of technique.uniform objects.",
             "properties" : {
             },
             "additionalProperties" : {
                 "$ref" : "technique.uniform.schema.json"
             },
             "default" : {},
-            "gltf_detailedDescription" : "A dictionary object of strings that maps GLSL attribute names to technique parameter IDs.  Each string must also be in the parameters dictionary object."
-        },
-        "states" : {
-            "allOf" : [ { "$ref" : "technique.states.schema.json" } ],
-            "description" : "Fixed-function rendering states.",
-            "default" : {}
+            "gltf_detailedDescription" : "A dictionary object of technique.uniform objects.  Each object defines a uniform input with a type and an optional semantic and value."
         },
         "name" : {},
         "extensions" : {},