[PATCH 0/3] MR1650: wined3d: Misc patches.

[PATCH 1/3] wined3d: Trace the sampler desc in wined3d_sampler_init().

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/sampler.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c
index c003770c74b..d6e19fc521c 100644
--- a/dlls/wined3d/sampler.c
+++ b/dlls/wined3d/sampler.c
@@ -59,6 +59,19 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d
     TRACE("sampler %p, device %p, desc %p, parent %p, parent_ops %p.\n",
             sampler, device, desc, parent, parent_ops);

+    TRACE("    Address modes: U %#x, V %#x, W %#x.\n", desc->address_u, desc->address_v, desc->address_w);
+    TRACE("    Border colour: {%.8e, %.8e, %.8e, %.8e}.\n",
+            desc->border_color[0], desc->border_color[1], desc->border_color[2], desc->border_color[3]);
+    TRACE("    Filters: mag %#x, min %#x, mip %#x.\n", desc->mag_filter, desc->min_filter, desc->mip_filter);
+    TRACE("    LOD bias: %.8e.\n", desc->lod_bias);
+    TRACE("    Minimum LOD: %.8e.\n", desc->min_lod);
+    TRACE("    Maximum LOD: %.8e.\n", desc->max_lod);
+    TRACE("    Base mip level: %u.\n", desc->mip_base_level);
+    TRACE("    Maximum anisotropy: %u.\n", desc->max_anisotropy);
+    TRACE("    Comparison: %d.\n", desc->compare);
+    TRACE("    Comparison func: %#x.\n", desc->comparison_func);
+    TRACE("    SRGB decode: %d.\n", desc->srgb_decode);
+
     sampler->refcount = 1;
     sampler->device = device;
     sampler->parent = parent;

[PATCH 2/3] wined3d: Trace the created command stream in wined3d_cs_create().

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/cs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 9dc1dffe575..23780b40a76 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -3462,6 +3462,7 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device,
         }
     }

+    TRACE("Created command stream %p.\n", cs);
     return cs;

fail:

[PATCH 3/3] wined3d: Make a couple of variables const.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/shader_spirv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c
index 7a7cb44c15d..60ef2c022aa 100644
--- a/dlls/wined3d/shader_spirv.c
+++ b/dlls/wined3d/shader_spirv.c
@@ -613,7 +613,7 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin
         struct wined3d_shader_resource_bindings *wined3d_bindings,
         const struct wined3d_state *state, uint32_t shader_mask)
 {
-    struct vkd3d_shader_scan_descriptor_info *descriptor_info;
+    const struct vkd3d_shader_scan_descriptor_info *descriptor_info;
     enum wined3d_shader_descriptor_type wined3d_type;
     enum vkd3d_shader_visibility shader_visibility;
     enum wined3d_shader_type shader_type;
@@ -652,7 +652,7 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin

for (i = 0; i < descriptor_info->descriptor_count; ++i)
         {
-            struct vkd3d_shader_descriptor_info *d = &descriptor_info->descriptors[i];
+            const struct vkd3d_shader_descriptor_info *d = &descriptor_info->descriptors[i];
             uint32_t flags;

if (d->register_space)

[PATCH 0/3] MR1650: wined3d: Misc patches. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.