1 files changed, 79 insertions, 0 deletions
diff --git a/src/quick/scenegraph/adaptations/d3d12/qsgd3d12material.cpp b/src/quick/scenegraph/adaptations/d3d12/qsgd3d12material.cpp
index 69160fa6b2..9480c296a3 100644
--- a/src/quick/scenegraph/adaptations/d3d12/qsgd3d12material.cpp
+++ b/src/quick/scenegraph/adaptations/d3d12/qsgd3d12material.cpp
@@ -38,12 +38,15 @@
 ****************************************************************************/
 
 #include "qsgd3d12material_p.h"
+#include "qsgd3d12texture_p.h"
 #include <private/qsgrenderer_p.h>
 
 #include "vs_vertexcolor.hlslh"
 #include "ps_vertexcolor.hlslh"
 #include "vs_smoothcolor.hlslh"
 #include "ps_smoothcolor.hlslh"
+#include "vs_texture.hlslh"
+#include "ps_texture.hlslh"
 
 QT_BEGIN_NAMESPACE
 
@@ -229,4 +232,80 @@ QSGD3D12Material::UpdateResults QSGD3D12SmoothColorMaterial::updatePipeline(cons
     return r;
 }
 
+QSGMaterialType QSGD3D12TextureMaterial::mtype;
+
+QSGMaterialType *QSGD3D12TextureMaterial::type() const
+{
+    return &QSGD3D12TextureMaterial::mtype;
+}
+
+int QSGD3D12TextureMaterial::compare(const QSGMaterial *other) const
+{
+    Q_ASSERT(other && type() == other->type());
+    const QSGD3D12TextureMaterial *o = static_cast<const QSGD3D12TextureMaterial *>(other);
+    if (int diff = m_texture->textureId() - o->texture()->textureId())
+        return diff;
+    return int(m_filtering) - int(o->m_filtering);
+}
+
+static const int TEXTURE_CB_SIZE_0 = 16 * sizeof(float); // float4x4
+static const int TEXTURE_CB_SIZE_1 = sizeof(float); // float
+static const int TEXTURE_CB_SIZE = TEXTURE_CB_SIZE_0 + TEXTURE_CB_SIZE_1;
+
+int QSGD3D12TextureMaterial::constantBufferSize() const
+{
+    return QSGD3D12Engine::alignedConstantBufferSize(TEXTURE_CB_SIZE);
+}
+
+void QSGD3D12TextureMaterial::preparePipeline(QSGD3D12ShaderState *shaders)
+{
+    shaders->vs = g_VS_Texture;
+    shaders->vsSize = sizeof(g_VS_Texture);
+    shaders->ps = g_PS_Texture;
+    shaders->psSize = sizeof(g_PS_Texture);
+
+    shaders->rootSig.textureViews.resize(1);
+}
+
+QSGD3D12Material::UpdateResults QSGD3D12TextureMaterial::updatePipeline(const RenderState &state,
+                                                                        QSGD3D12ShaderState *shaders,
+                                                                        quint8 *constantBuffer)
+{
+    QSGD3D12Material::UpdateResults r = 0;
+    quint8 *p = constantBuffer;
+
+    if (state.isMatrixDirty()) {
+        memcpy(p, state.combinedMatrix().constData(), TEXTURE_CB_SIZE_0);
+        r |= UpdatedConstantBuffer;
+    }
+    p += TEXTURE_CB_SIZE_0;
+
+    if (state.isOpacityDirty()) {
+        const float opacity = state.opacity();
+        memcpy(p, &opacity, TEXTURE_CB_SIZE_1);
+        r |= UpdatedConstantBuffer;
+    }
+
+    Q_ASSERT(m_texture);
+    m_texture->setFiltering(m_filtering);
+    m_texture->setMipmapFiltering(m_mipmap_filtering);
+    m_texture->setHorizontalWrapMode(m_horizontal_wrap);
+    m_texture->setVerticalWrapMode(m_vertical_wrap);
+
+    // ### filling this every time is cheap but we could still skip it if we could access the QSGTexture's wrapChanged and similar fields
+    QSGD3D12TextureView &tv(shaders->rootSig.textureViews[0]);
+    if (m_filtering == QSGTexture::Linear)
+        tv.filter = m_mipmap_filtering == QSGTexture::Linear
+                ? QSGD3D12TextureView::FilterLinear : QSGD3D12TextureView::FilterMinMagLinearMipNearest;
+    else
+        tv.filter = m_mipmap_filtering == QSGTexture::Linear
+                ? QSGD3D12TextureView::FilterMinMagNearestMipLinear : QSGD3D12TextureView::FilterNearest;
+    tv.addressModeHoriz = m_horizontal_wrap == QSGTexture::ClampToEdge ? QSGD3D12TextureView::AddressClamp : QSGD3D12TextureView::AddressWrap;
+    tv.addressModeVert = m_vertical_wrap == QSGTexture::ClampToEdge ? QSGD3D12TextureView::AddressClamp : QSGD3D12TextureView::AddressWrap;
+
+    m_texture->bind();
+
+    return r;
+}
+
 QT_END_NAMESPACE