summaryrefslogtreecommitdiffstats
path: root/src/render/io/gltfparser.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-09-20 15:52:08 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-09-21 13:27:04 +0200
commit1d2aaae6a0e9d832690a7b6b1f872aaeca3ed86a (patch)
tree76a8abea41870d60953a75b4da8a29fe3cd7f1f9 /src/render/io/gltfparser.cpp
parent8f8ef078353dd4d96b35804117acf914a93f9412 (diff)
Add support for remaining shader stages and rename some properties
Examples updated to reflect new QShaderProgram property names. Next commit will add a new example to test the handling of tessellation and geometry shader stages. We need to somehow expose buffers and image units to make use of compute shaders. Change-Id: Idf76cef97a42d5829402c8aa8cc4e288678a3407 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/gltfparser.cpp')
-rw-r--r--src/render/io/gltfparser.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index 91ae3f81f..527f10272 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -733,8 +733,8 @@ void GLTFParser::processJSONProgram( QString id, QJsonObject jsonObj)
return;
}
- prog->setFragmentSourceFile(m_shaderPaths[fragName]);
- prog->setVertexSourceFile(m_shaderPaths[vertName]);
+ prog->setFragmentShaderSourceFile(m_shaderPaths[fragName]);
+ prog->setVertexShaderSourceFile(m_shaderPaths[vertName]);
m_programs[id] = prog;
}