diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2014-10-15 13:38:32 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2014-10-16 10:18:14 +0200 |
commit | cd1d21fdad54315c4a8ade860ce6b31aa5a6f4b9 (patch) | |
tree | c1c042dfdb6c7fd8644c2e45a1cdad18b0703e57 /src/render/frontend/qshaderprogram.cpp | |
parent | 0f1d0ff5b3adb16afcda091e4ff4657f53581f79 (diff) |
Have copy() only on QNode
It was previously both on QNode and QNodePrivate. The one on
QNodePrivate didn't give us much as it didn't eliminate the virtual of
QNode.
Change-Id: Ia1ea9dd831674109c84bd7005abe7fde3b1223fa
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qshaderprogram.cpp')
-rw-r--r-- | src/render/frontend/qshaderprogram.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/render/frontend/qshaderprogram.cpp b/src/render/frontend/qshaderprogram.cpp index c3e83ccb8..8139e38a8 100644 --- a/src/render/frontend/qshaderprogram.cpp +++ b/src/render/frontend/qshaderprogram.cpp @@ -54,23 +54,23 @@ QShaderProgramPrivate::QShaderProgramPrivate(QShaderProgram *qq) { } -void QShaderProgramPrivate::copy(const QNodePrivate *ref) -{ - QNodePrivate::copy(ref); - const QShaderProgramPrivate *prog = static_cast<const QShaderProgramPrivate *>(ref); - m_vertexSourceFile = prog->m_vertexSourceFile; - m_tessControlSourceFile = prog->m_tessControlSourceFile; - m_tessEvalSourceFile = prog->m_tessEvalSourceFile; - m_geometrySourceFile = prog->m_geometrySourceFile; - m_fragmentSourceFile = prog->m_fragmentSourceFile; - m_computeSourceFile = prog->m_computeSourceFile; - - m_vertexShaderCode = prog->m_vertexShaderCode; - m_tessControlShaderCode = prog->m_tessControlShaderCode; - m_tessEvalShaderCode = prog->m_tessEvalShaderCode; - m_geometryShaderCode = prog->m_geometryShaderCode; - m_fragmentShaderCode = prog->m_fragmentShaderCode; - m_computeShaderCode = prog->m_computeShaderCode; +void QShaderProgram::copy(const QNode *ref) +{ + QNode::copy(ref); + const QShaderProgram *prog = static_cast<const QShaderProgram*>(ref); + d_func()->m_vertexSourceFile = prog->d_func()->m_vertexSourceFile; + d_func()->m_tessControlSourceFile = prog->d_func()->m_tessControlSourceFile; + d_func()->m_tessEvalSourceFile = prog->d_func()->m_tessEvalSourceFile; + d_func()->m_geometrySourceFile = prog->d_func()->m_geometrySourceFile; + d_func()->m_fragmentSourceFile = prog->d_func()->m_fragmentSourceFile; + d_func()->m_computeSourceFile = prog->d_func()->m_computeSourceFile; + + d_func()->m_vertexShaderCode = prog->d_func()->m_vertexShaderCode; + d_func()->m_tessControlShaderCode = prog->d_func()->m_tessControlShaderCode; + d_func()->m_tessEvalShaderCode = prog->d_func()->m_tessEvalShaderCode; + d_func()->m_geometryShaderCode = prog->d_func()->m_geometryShaderCode; + d_func()->m_fragmentShaderCode = prog->d_func()->m_fragmentShaderCode; + d_func()->m_computeShaderCode = prog->d_func()->m_computeShaderCode; } QShaderProgram::QShaderProgram(QNode *parent) |