diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-25 15:09:03 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-02-26 09:45:12 +0000 |
| commit | 7e2f9d42eebe13182918d832577c4f5ed96ab87b (patch) | |
| tree | cee2c929e6a1fe365d3a290067fe0ab935069162 /examples | |
| parent | 473fb46f44d4225675c5d903501a7cb9ee6b8258 (diff) | |
Remove ParameterMapping
* Bindings are now entirely deduced from shader introspection
* Modified the BackendNodeDirtyFlags to remove the class at this
prevents the operator~() to be called
* Make the Renderer loop check for the ComputeDirty flag and
don't unset it if set
Note: uses a hack to reset m_changeSet in performCompute as right know
we are sometimes missing the markDirty(ComputeDirty) set by the ComputeJob nodes.
Will be sorted out later.
Change-Id: Ic4fa71ecf01b625e885a58a66278387bf5b36339
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qt3d/compute-particles/ComputeMaterial.qml | 4 | ||||
| -rw-r--r-- | examples/qt3d/instanced-arrays-qml/main.qml | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/examples/qt3d/compute-particles/ComputeMaterial.qml b/examples/qt3d/compute-particles/ComputeMaterial.qml index f4ac1105a..01fef2bd9 100644 --- a/examples/qt3d/compute-particles/ComputeMaterial.qml +++ b/examples/qt3d/compute-particles/ComputeMaterial.qml @@ -100,10 +100,6 @@ Material { shaderProgram: drawShader // We assume the mesh to be drawn will also receive // Vertex buffers attributes that will be used to position and color - bindings: [ - ParameterMapping { parameterName: "particlePosition"; shaderVariableName: "particlePosition"; bindingType: ParameterMapping.Attribute }, - ParameterMapping { parameterName: "particleColor"; shaderVariableName: "particleColor"; bindingType: ParameterMapping.Attribute } - ] } ] annotations: [ diff --git a/examples/qt3d/instanced-arrays-qml/main.qml b/examples/qt3d/instanced-arrays-qml/main.qml index 993e740fa..96a258da4 100644 --- a/examples/qt3d/instanced-arrays-qml/main.qml +++ b/examples/qt3d/instanced-arrays-qml/main.qml @@ -93,9 +93,6 @@ Entity { } annotations: Annotation { name: "renderingStyle"; value: "forward" } renderPasses: RenderPass { - bindings: [ - ParameterMapping { parameterName: "pos"; shaderVariableName: "pos"; bindingType: ParameterMapping.Attribute } - ] shaderProgram: ShaderProgram { vertexShaderCode: loadSource("qrc:/instanced.vert") fragmentShaderCode: loadSource("qrc:/instanced.frag") |