diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-06-12 14:22:33 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-06-17 10:32:57 +0200 |
commit | 6f4aa5413183f3f18dd1b15dbc90bcee9ef85bdd (patch) | |
tree | 4e0d3d98de98f7a77cc9c52d4b11682093d94958 /tests/manual/rhi/msaatexture | |
parent | 4c297bdca8da543c582d129f12413d29a2a520eb (diff) |
rhi: Add compute api and implement for Vulkan and Metal
D3D11 and GL (4.3+, ES 3.1+) will come separately at a
later time.
Change-Id: If30f2f3d062fa27e57e9912674669225b82a7b93
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/manual/rhi/msaatexture')
-rw-r--r-- | tests/manual/rhi/msaatexture/msaatexture.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/manual/rhi/msaatexture/msaatexture.cpp b/tests/manual/rhi/msaatexture/msaatexture.cpp index 1b652cce92..46a9b2830c 100644 --- a/tests/manual/rhi/msaatexture/msaatexture.cpp +++ b/tests/manual/rhi/msaatexture/msaatexture.cpp @@ -164,8 +164,8 @@ void Window::customInit() d.psLeft = m_r->newGraphicsPipeline(); d.releasePool << d.psLeft; d.psLeft->setShaderStages({ - { QRhiGraphicsShaderStage::Vertex, getShader(QLatin1String(":/texture.vert.qsb")) }, - { QRhiGraphicsShaderStage::Fragment, getShader(QLatin1String(":/texture.frag.qsb")) } + { QRhiShaderStage::Vertex, getShader(QLatin1String(":/texture.vert.qsb")) }, + { QRhiShaderStage::Fragment, getShader(QLatin1String(":/texture.frag.qsb")) } }); QRhiVertexInputLayout inputLayout; inputLayout.setBindings({ { 4 * sizeof(float) } }); @@ -181,11 +181,11 @@ void Window::customInit() d.psRight = m_r->newGraphicsPipeline(); d.releasePool << d.psRight; d.psRight->setShaderStages({ - { QRhiGraphicsShaderStage::Vertex, getShader(QLatin1String(":/texture.vert.qsb")) }, + { QRhiShaderStage::Vertex, getShader(QLatin1String(":/texture.vert.qsb")) }, #ifndef NO_MSAA - { QRhiGraphicsShaderStage::Fragment, getShader(QLatin1String(":/texture_ms4.frag.qsb")) } + { QRhiShaderStage::Fragment, getShader(QLatin1String(":/texture_ms4.frag.qsb")) } #else - { QRhiGraphicsShaderStage::Fragment, getShader(QLatin1String(":/texture.frag.qsb")) } + { QRhiShaderStage::Fragment, getShader(QLatin1String(":/texture.frag.qsb")) } #endif }); d.psRight->setVertexInputLayout(d.psLeft->vertexInputLayout()); @@ -219,8 +219,8 @@ void Window::customInit() d.releasePool << d.triPs; d.triPs->setSampleCount(1); d.triPs->setShaderStages({ - { QRhiGraphicsShaderStage::Vertex, getShader(QLatin1String(":/color.vert.qsb")) }, - { QRhiGraphicsShaderStage::Fragment, getShader(QLatin1String(":/color.frag.qsb")) } + { QRhiShaderStage::Vertex, getShader(QLatin1String(":/color.vert.qsb")) }, + { QRhiShaderStage::Fragment, getShader(QLatin1String(":/color.frag.qsb")) } }); inputLayout.setBindings({ { 5 * sizeof(float) } |