Remove trailing Lua references

Also remove Lua from .gitmodules

Task-number: QT3DS-12
Change-Id: I9e5349b8fc2e69e0d5be802f2499948b5bf04156
Reviewed-by: Antti Määttä <antti.maatta@qt.io>

3 files changed, 2 insertions, 50 deletions

diff --git a/.gitmodules b/.gitmodules
index 41a50f5c..48e2a4d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "src/3rdparty/pcre"]
 	path = src/3rdparty/pcre
 	url = ../qt3dstudio-pcre.git
-[submodule "src/3rdparty/Lua"]
-	path = src/3rdparty/Lua
-	url = ../qt3dstudio-lua.git
 [submodule "src/Runtime/qt3d-runtime"]
 	path = src/Runtime/qt3d-runtime
 	url = ../qt3d-runtime.git
diff --git a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
index 4c4734f6..98b95a13 100644
--- a/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
+++ b/src/Runtime/Source/Qt3DSRuntimeRender/Source/Qt3DSRenderCustomMaterialSystem.cpp
@@ -1225,51 +1225,6 @@ struct SMaterialSystem : public ICustomMaterialSystem
         return SMaterialOrComputeShader();
     }
 
-    SMaterialOrComputeShader BindShaderFromLua(SCustomMaterialRenderContext &inRenderContext,
-                                               const SBindShader &inCommand,
-                                               TShaderFeatureSet inFeatureSet)
-    {
-        SDynamicShaderProgramFlags theFlags(inRenderContext.m_Model.m_TessellationMode,
-                                            inRenderContext.m_Subset.m_WireframeMode);
-        theFlags.SetTessellationEnabled(inRenderContext.m_Model.m_TessellationMode
-                                        != TessModeValues::NoTess);
-        theFlags.SetGeometryShaderEnabled(inRenderContext.m_Subset.m_WireframeMode);
-
-        TShaderAndFlags theProgramAndFlags =
-            m_Context->GetDynamicObjectSystem().GetShaderProgram(
-                inCommand.m_ShaderPath, inCommand.m_ShaderDefine, inFeatureSet, theFlags);
-
-        NVRenderShaderProgram *theProgram = theProgramAndFlags.first;
-        if (theProgram) {
-            if (theProgram->GetProgramType() == NVRenderShaderProgram::ProgramType::Graphics) {
-                SShaderDefaultMaterialKey theMaterialKey = 0;
-                SShaderMapKey skey = SShaderMapKey(
-                    TStrStrPair(inCommand.m_ShaderPath, inCommand.m_ShaderDefine), inFeatureSet,
-                    theFlags.m_TessMode, theFlags.m_WireframeMode, theMaterialKey);
-                eastl::pair<TShaderMap::iterator, bool> theInsertResult(m_ShaderMap.insert(
-                    eastl::make_pair(skey, NVScopedRefCounted<SCustomMaterialShader>(NULL))));
-
-                if (theInsertResult.second) {
-                    if (theProgram)
-                        theInsertResult.first->second = QT3DS_NEW(m_Allocator, SCustomMaterialShader)(
-                            *theProgram, theProgramAndFlags.second);
-                }
-
-                if (theInsertResult.first->second) {
-                    NVRenderContext &theContext(m_Context->GetRenderContext());
-                    theContext.SetActiveShader(theInsertResult.first->second->m_Shader);
-                }
-
-                return *theInsertResult.first->second;
-            } else {
-                NVRenderContext &theContext(m_Context->GetRenderContext());
-                theContext.SetActiveShader(theProgram);
-                return *(static_cast<NVRenderShaderProgram *>(theProgram));
-            }
-        }
-        return SMaterialOrComputeShader();
-    }
-
     void DoApplyInstanceValue(SCustomMaterial & /* inMaterial */, QT3DSU8 *inDataPtr,
                               CRegisteredString inPropertyName,
                               NVRenderShaderDataTypes::Enum inPropertyType,
diff --git a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h
index 795ef02f..4d08f695 100644
--- a/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h
+++ b/src/Runtime/Source/Qt3DSStateApplication/Include/Qt3DSStateVisualBindingContextCommands.h
@@ -125,7 +125,7 @@ namespace state {
             a. If the handler attribute is missing, or references a value that is not a function
     value, an error must be logged each time the executable would have been run, and the executable
     ignored.
-    3. A <call.../> executable may have an args="..." attribute that specifies a Lua expression to
+    3. A <call.../> executable may have an args="..." attribute that specifies an expression to
     evaluate.
             a. If the result of evaluating this expression is a single value, it is passed as the
     first argument to the behavior's function.
@@ -175,7 +175,7 @@ namespace state {
     executable ignored.
     3. A <set-attribute.../> executable must have an value="..." attribute that describes the value
     to set.
-            a. The contents of this attribute are evaluated as a Lua expression and the result used
+            a. The contents of this attribute are evaluated as an expression and the result used
     to set the attribute.
                     i. If the result of evaluating this expression does not match the type of the
     attribute on the element then an error must be logged and the executable ignored.