Mesa (staging/23.3): d3d10umd: Fix compilation

[GitLab Mirror]

Module: Mesa
Branch: staging/23.3
Commit: 6468166ae22087ee0ba2ec8f09ec6fc15fe37072
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6468166ae22087ee0ba2ec8f09ec6fc15fe37072

Author: Max R <max8...@gmail.com>
Date:   Tue Nov 28 17:35:31 2023 +0300

d3d10umd: Fix compilation

Fixes: 4eb4c9bba ("d3d10umd: use cso_context to set vertex buffers and 
elements")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10054
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26370>
(cherry picked from commit 75fa621d34967773c0b9a40d29ba9b24d1c4bb6b)

---

 .pick_status.json                                |  2 +-
 src/gallium/frontends/d3d10umd/Draw.cpp          |  9 ++++++---
 src/gallium/frontends/d3d10umd/InputAssembly.cpp | 16 ++++------------
 src/gallium/frontends/d3d10umd/State.h           | 12 +++---------
 4 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 9acfcbde276..ce8781e326c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1374,7 +1374,7 @@
         "description": "d3d10umd: Fix compilation",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "4eb4c9bba97d659eb199cf41fb607d02caf6c748",
         "notes": null
diff --git a/src/gallium/frontends/d3d10umd/Draw.cpp 
b/src/gallium/frontends/d3d10umd/Draw.cpp
index f3fecb63703..62954e41a29 100644
--- a/src/gallium/frontends/d3d10umd/Draw.cpp
+++ b/src/gallium/frontends/d3d10umd/Draw.cpp
@@ -59,9 +59,12 @@ update_velems(Device *pDevice)
    if (!pDevice->velems_changed)
       return;
 
-   for (unsigned i = 0; i < pDevice->velems.count; i++)
-      pDevice->element_layout->velems.velems[i].src_stride = 
pDevice->vertex_strides[pDevice->element_layout->velems.velems[i].vertex_buffer_index];
-   cso_set_vertex_elements(pDevice->cso, &pDevice->element_layout->velems);
+   if(pDevice->element_layout) {
+      struct cso_velems_state *state = &pDevice->element_layout->state;
+      for (unsigned i = 0; i < state->count; i++)
+         state->velems[i].src_stride = 
pDevice->vertex_strides[state->velems[i].vertex_buffer_index];
+      cso_set_vertex_elements(pDevice->cso, state);
+   }
 
    pDevice->velems_changed = false;
 }
diff --git a/src/gallium/frontends/d3d10umd/InputAssembly.cpp 
b/src/gallium/frontends/d3d10umd/InputAssembly.cpp
index f9d191c3a19..f40ba04b626 100644
--- a/src/gallium/frontends/d3d10umd/InputAssembly.cpp
+++ b/src/gallium/frontends/d3d10umd/InputAssembly.cpp
@@ -126,7 +126,6 @@ IaSetVertexBuffers(D3D10DDI_HDEVICE hDevice,
    LOG_ENTRYPOINT();
 
    Device *pDevice = CastDevice(hDevice);
-   struct pipe_context *pipe = pDevice->pipe;
    unsigned i;
 
    for (i = 0; i < NumBuffers; i++) {
@@ -169,7 +168,7 @@ IaSetVertexBuffers(D3D10DDI_HDEVICE hDevice,
 
       /* XXX this is odd... */
       if (!vb->is_user_buffer && !vb->buffer.resource) {
-         pDevice->vertex_strides[i]->stride = 0;
+         pDevice->vertex_strides[i] = 0;
          vb->buffer_offset = 0;
          vb->is_user_buffer = true;
          vb->buffer.user = dummy;
@@ -271,9 +270,7 @@ CreateElementLayout(
    LOG_ENTRYPOINT();
 
    ElementLayout *pElementLayout = CastElementLayout(hElementLayout);
-
-   struct cso_velems_state elements;
-   memset(elements, 0, sizeof elements);
+   memset(pElementLayout, 0, sizeof *pElementLayout);
 
    unsigned num_elements = pCreateElementLayout->NumElements;
    unsigned max_elements = 0;
@@ -281,7 +278,7 @@ CreateElementLayout(
       const D3D10DDIARG_INPUT_ELEMENT_DESC* pVertexElement =
             &pCreateElementLayout->pVertexElements[i];
       struct pipe_vertex_element *ve =
-            &elements.velems[pVertexElement->InputRegister];
+            &pElementLayout->state.velems[pVertexElement->InputRegister];
 
       ve->src_offset          = pVertexElement->AlignedByteOffset;
       ve->vertex_buffer_index = pVertexElement->InputSlot;
@@ -312,8 +309,7 @@ CreateElementLayout(
       DebugPrintf("%s: gap\n", __func__);
    }
 
-   elements.count = max_elements;
-   pElementLayout->velems = mem_dup(elements, sizeof(elements));
+   pElementLayout->state.count = max_elements;
 }
 
 
@@ -335,10 +331,6 @@ DestroyElementLayout(D3D10DDI_HDEVICE hDevice,             
    // IN
 {
    LOG_ENTRYPOINT();
 
-   struct pipe_context *pipe = CastPipeContext(hDevice);
-   ElementLayout *pElementLayout = CastElementLayout(hElementLayout);
-
-   free(pElementLayout->velems);
 }
 
 
diff --git a/src/gallium/frontends/d3d10umd/State.h 
b/src/gallium/frontends/d3d10umd/State.h
index 46fde9c5c78..dd8c3a83ca6 100644
--- a/src/gallium/frontends/d3d10umd/State.h
+++ b/src/gallium/frontends/d3d10umd/State.h
@@ -62,6 +62,7 @@ struct Shader
 };
 
 struct Query;
+struct ElementLayout;
 
 struct Device
 {
@@ -105,6 +106,7 @@ struct Device
    Query *pPredicate;
    BOOL PredicateValue;
 
+   ElementLayout *element_layout;
    BOOL velems_changed;
 };
 
@@ -326,7 +328,7 @@ CastPipeShader(D3D10DDI_HSHADER hShader)
 
 struct ElementLayout
 {
-   struct cso_velems_state *velems;
+   struct cso_velems_state state;
 };
 
 
@@ -336,14 +338,6 @@ CastElementLayout(D3D10DDI_HELEMENTLAYOUT hElementLayout)
    return static_cast<ElementLayout *>(hElementLayout.pDrvPrivate);
 }
 
-static inline void *
-CastPipeInputLayout(D3D10DDI_HELEMENTLAYOUT hElementLayout)
-{
-   ElementLayout *pElementLayout = CastElementLayout(hElementLayout);
-   return pElementLayout ? pElementLayout->handle : NULL;
-}
-
-
 struct SamplerState
 {
    void *handle;