1 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/frontends/d3d10umd/State.h b/src/gallium/frontends/d3d10umd/State.h
index 5cb865ce695..6a05c3cde0f 100644
--- a/src/gallium/frontends/d3d10umd/State.h
+++ b/src/gallium/frontends/d3d10umd/State.h
@@ -33,7 +33,7 @@
 
 #include "DriverIncludes.h"
 #include "util/u_hash_table.h"
-
+#include "cso_cache/cso_context.h"
 
 #define SUPPORT_MSAA 0
 #define SUPPORT_D3D10_1 0
@@ -58,17 +58,20 @@ struct Shader
    uint type;
    struct pipe_shader_state state;
    unsigned output_mapping[PIPE_MAX_SHADER_OUTPUTS];
-   boolean output_resolved;
+   bool output_resolved;
 };
 
 struct Query;
+struct ElementLayout;
 
 struct Device
 {
    struct pipe_context *pipe;
 
+   struct cso_context *cso;
    struct pipe_framebuffer_state fb;
    struct pipe_vertex_buffer vertex_buffers[PIPE_MAX_ATTRIBS];
+   unsigned vertex_strides[PIPE_MAX_ATTRIBS];
    struct pipe_resource *index_buffer;
    unsigned restart_index;
    unsigned index_size;
@@ -79,7 +82,7 @@ struct Device
    void *empty_fs;
    void *empty_vs;
 
-   enum pipe_prim_type primitive;
+   enum mesa_prim primitive;
 
    struct pipe_stream_output_target *so_targets[PIPE_MAX_SO_BUFFERS];
    struct pipe_stream_output_target *draw_so_target;
@@ -102,6 +105,10 @@ struct Device
 
    Query *pPredicate;
    BOOL PredicateValue;
+
+   ElementLayout *element_layout;
+   BOOL velems_changed;
+   BOOL vbuffers_changed;
 };
 
 
@@ -150,6 +157,7 @@ struct Resource
    DXGI_FORMAT Format;
    UINT MipLevels;
    UINT NumSubResources;
+   bool buffer;
    struct pipe_resource *resource;
    struct pipe_transfer **transfers;
    struct pipe_stream_output_target *so_target;
@@ -321,7 +329,7 @@ CastPipeShader(D3D10DDI_HSHADER hShader)
 
 struct ElementLayout
 {
-   void *handle;
+   struct cso_velems_state state;
 };
 
 
@@ -331,14 +339,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;