Commit 88c91d26 authored by Mårten Nordheim's avatar Mårten Nordheim

More namespace fixes

parent 90f86614
Pipeline #4118 passed with stage
in 4 minutes and 34 seconds
......@@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE
uint qHash(const QDemonRenderConstantBuffer::ParamHandle &h, uint seed) Q_DECL_NOTHROW
{
return (h.key) ? h.key : ::qHash(h.name, seed);
return (h.key) ? h.key : QT_PREPEND_NAMESPACE(qHash(h.name, seed));
}
///< struct handling a constant buffer entry
......
......@@ -32,6 +32,8 @@
#include "qdemonrendermaterialshadergenerator.h"
#include <QtDemonRuntimeRender/qdemonrendercontextcore.h>
QT_BEGIN_NAMESPACE
QDemonMaterialShaderGeneratorInterface::QDemonMaterialShaderGeneratorInterface(QDemonRenderContextInterface *renderContext)
: m_renderContext(renderContext),
m_programGenerator(m_renderContext->shaderProgramGenerator())
......@@ -39,3 +41,5 @@ QDemonMaterialShaderGeneratorInterface::QDemonMaterialShaderGeneratorInterface(Q
{}
QDemonMaterialShaderGeneratorInterface::~QDemonMaterialShaderGeneratorInterface() {}
QT_END_NAMESPACE
......@@ -40,8 +40,6 @@ QDemonRef<QDemonRenderList> QDemonRenderList::createRenderList()
QDemonRenderTask::~QDemonRenderTask() = default;
QT_END_NAMESPACE
void QDemonRenderList::beginFrame()
{
m_nextTaskId = 1;
......@@ -77,3 +75,5 @@ void QDemonRenderList::runRenderTasks()
}
beginFrame();
}
QT_END_NAMESPACE
......@@ -207,8 +207,6 @@ QDemonRef<QDemonShaderCache> QDemonShaderCache::createShaderCache(const QDemonRe
return QDemonRef<QDemonShaderCache>(new QDemonShaderCache(inContext, inInputStreamFactory, inPerfTimer));
}
QT_END_NAMESPACE
QDemonShaderCache::QDemonShaderCache(const QDemonRef<QDemonRenderContext> &ctx, const QDemonRef<QDemonInputStreamFactory> &inInputStreamFactory, QDemonPerfTimer *inPerfTimer)
: m_renderContext(ctx), m_perfTimer(inPerfTimer), m_inputStreamFactory(inInputStreamFactory), m_shaderCompilationEnabled(true)
{
......@@ -652,3 +650,5 @@ void QDemonShaderCache::setShaderCompilationEnabled(bool inEnableShaderCompilati
{
m_shaderCompilationEnabled = inEnableShaderCompilation;
}
QT_END_NAMESPACE
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment