[PATCH 0/4] MR4436: wined3d: Set d3d 1-9 textures in the state as SRVs.

[PATCH 1/4] d3d9: Do not destroy the SRV until the wined3d texture is destroyed.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/d3d9/texture.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index a3a4dc41272..94c17be2c27 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -57,8 +57,6 @@ static ULONG d3d9_texture_decref(struct d3d9_texture *texture)
         struct d3d9_surface *surface;

wined3d_mutex_lock();
-        if (texture->wined3d_srv)
-            wined3d_shader_resource_view_decref(texture->wined3d_srv);
         LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry)
             wined3d_rendertarget_view_decref(surface->wined3d_rtv);
         wined3d_texture_decref(d3d9_texture_get_draw_texture(texture));
@@ -92,18 +90,6 @@ static inline struct d3d9_texture *impl_from_IDirect3DVolumeTexture9(IDirect3DVo
     return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
 }

-static void STDMETHODCALLTYPE srv_wined3d_object_destroyed(void *parent)
-{
-    struct d3d9_texture *texture = parent;
-
-    texture->wined3d_srv = NULL;
-}
-
-static const struct wined3d_parent_ops d3d9_srv_wined3d_parent_ops =
-{
-    srv_wined3d_object_destroyed,
-};
-
 /* wined3d critical section must be taken by the caller. */
 static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource_view(struct d3d9_texture *texture)
 {
@@ -123,7 +109,7 @@ static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource
     desc.u.texture.layer_count = sr_desc.usage & WINED3DUSAGE_LEGACY_CUBEMAP ? 6 : 1;
     if (FAILED(hr = wined3d_shader_resource_view_create(&desc,
             wined3d_texture_get_resource(d3d9_texture_get_draw_texture(texture)), texture,
-            &d3d9_srv_wined3d_parent_ops, &texture->wined3d_srv)))
+            &d3d9_null_wined3d_parent_ops, &texture->wined3d_srv)))
     {
         ERR("Failed to create shader resource view, hr %#lx.\n", hr);
         return NULL;
@@ -1263,6 +1249,8 @@ static void STDMETHODCALLTYPE d3d9_texture_wined3d_object_destroyed(void *parent
 {
     struct d3d9_texture *texture = parent;

+    if (texture->wined3d_srv)
+        wined3d_shader_resource_view_decref(texture->wined3d_srv);
     /* If the texture was managed, release the sysmem copy now. */
     if (texture->draw_texture)
         wined3d_texture_decref(texture->wined3d_texture);

[PATCH 2/4] wined3d: Introduce an API for creating an identity SRV on a texture.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/wined3d/texture.c         | 24 ++++++++++++++++++++++++
 dlls/wined3d/wined3d.spec      |  1 +
 dlls/wined3d/wined3d_private.h |  2 ++
 include/wine/wined3d.h         |  1 +
 4 files changed, 28 insertions(+)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 3dfecc949d1..722c3db23b2 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -4667,6 +4667,30 @@ void wined3d_texture_update_sub_resource(struct wined3d_texture *texture, unsign
     wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB);
 }

+struct wined3d_shader_resource_view * CDECL wined3d_texture_acquire_identity_srv(struct wined3d_texture *texture)
+{
+    struct wined3d_view_desc desc;
+    HRESULT hr;
+
+    if (texture->identity_srv)
+        return texture->identity_srv;
+
+    desc.format_id = texture->resource.format->id;
+    desc.flags = 0;
+    desc.u.texture.level_idx = 0;
+    desc.u.texture.level_count = texture->level_count;
+    desc.u.texture.layer_idx = 0;
+    desc.u.texture.layer_count = texture->layer_count;
+    if (FAILED(hr = wined3d_shader_resource_view_create(&desc, &texture->resource,
+            NULL, &wined3d_null_parent_ops, &texture->identity_srv)))
+    {
+        ERR("Failed to create shader resource view, hr %#lx.\n", hr);
+        return NULL;
+    }
+
+    return texture->identity_srv;
+}
+
 static void wined3d_texture_no3d_upload_data(struct wined3d_context *context,
         const struct wined3d_const_bo_address *src_bo_addr, const struct wined3d_format *src_format,
         const struct wined3d_box *src_box, unsigned int src_row_pitch, unsigned int src_slice_pitch,
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 2eaf83160c1..72e0e3fd8fa 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -298,6 +298,7 @@
 @ cdecl wined3d_swapchain_state_resize_target(ptr ptr)
 @ cdecl wined3d_swapchain_state_set_fullscreen(ptr ptr ptr)

+@ cdecl wined3d_texture_acquire_identity_srv(ptr)
 @ cdecl wined3d_texture_add_dirty_region(ptr long ptr)
 @ cdecl wined3d_texture_create(ptr ptr long long long ptr ptr ptr ptr)
 @ cdecl wined3d_texture_decref(ptr)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index bb955873467..eda3a515ea7 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -3335,6 +3335,8 @@ struct wined3d_texture
     unsigned int row_pitch;
     unsigned int slice_pitch;

+    struct wined3d_shader_resource_view *identity_srv;
+
     /* May only be accessed from the command stream worker thread. */
     struct wined3d_texture_async
     {
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index c2f7950ad3f..03b6989bb72 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2866,6 +2866,7 @@ HRESULT __cdecl wined3d_swapchain_state_resize_target(struct wined3d_swapchain_s
 HRESULT __cdecl wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_state *state,
         const struct wined3d_swapchain_desc *desc, const struct wined3d_display_mode *mode);

+struct wined3d_shader_resource_view * __cdecl wined3d_texture_acquire_identity_srv(struct wined3d_texture *texture);
 HRESULT __cdecl wined3d_texture_add_dirty_region(struct wined3d_texture *texture,
         UINT layer, const struct wined3d_box *dirty_region);
 HRESULT __cdecl wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc,

[PATCH 3/4] d3d9: Use wined3d_texture_acquire_identity_srv().

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/d3d9/d3d9_private.h |  1 -
 dlls/d3d9/texture.c      | 34 ++--------------------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index fcd82d2e674..a5f059c5aef 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -222,7 +222,6 @@ struct d3d9_texture
     struct list rtv_list;
     DWORD usage;
     BOOL flags;
-    struct wined3d_shader_resource_view *wined3d_srv;
     D3DTEXTUREFILTERTYPE autogen_filter_type;
 };

diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 94c17be2c27..4de7d2eb99e 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -90,44 +90,16 @@ static inline struct d3d9_texture *impl_from_IDirect3DVolumeTexture9(IDirect3DVo
     return CONTAINING_RECORD(iface, struct d3d9_texture, IDirect3DBaseTexture9_iface);
 }

-/* wined3d critical section must be taken by the caller. */
-static struct wined3d_shader_resource_view *d3d9_texture_acquire_shader_resource_view(struct d3d9_texture *texture)
-{
-    struct wined3d_sub_resource_desc sr_desc;
-    struct wined3d_view_desc desc;
-    HRESULT hr;
-
-    if (texture->wined3d_srv)
-        return texture->wined3d_srv;
-
-    wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, 0, &sr_desc);
-    desc.format_id = sr_desc.format;
-    desc.flags = 0;
-    desc.u.texture.level_idx = 0;
-    desc.u.texture.level_count = wined3d_texture_get_level_count(texture->wined3d_texture);
-    desc.u.texture.layer_idx = 0;
-    desc.u.texture.layer_count = sr_desc.usage & WINED3DUSAGE_LEGACY_CUBEMAP ? 6 : 1;
-    if (FAILED(hr = wined3d_shader_resource_view_create(&desc,
-            wined3d_texture_get_resource(d3d9_texture_get_draw_texture(texture)), texture,
-            &d3d9_null_wined3d_parent_ops, &texture->wined3d_srv)))
-    {
-        ERR("Failed to create shader resource view, hr %#lx.\n", hr);
-        return NULL;
-    }
-
-    return texture->wined3d_srv;
-}
-
 /* wined3d critical section must be taken by the caller. */
 void d3d9_texture_gen_auto_mipmap(struct d3d9_texture *texture)
 {
     if (!(texture->flags & D3D9_TEXTURE_MIPMAP_DIRTY))
         return;
-    d3d9_texture_acquire_shader_resource_view(texture);
     if (texture->draw_texture)
         wined3d_device_update_texture(texture->parent_device->wined3d_device,
                 texture->wined3d_texture, texture->draw_texture);
-    wined3d_device_context_generate_mipmaps(texture->parent_device->immediate_context, texture->wined3d_srv);
+    wined3d_device_context_generate_mipmaps(texture->parent_device->immediate_context,
+            wined3d_texture_acquire_identity_srv(d3d9_texture_get_draw_texture(texture)));
     texture->flags &= ~D3D9_TEXTURE_MIPMAP_DIRTY;
 }

@@ -1249,8 +1221,6 @@ static void STDMETHODCALLTYPE d3d9_texture_wined3d_object_destroyed(void *parent
 {
     struct d3d9_texture *texture = parent;

-    if (texture->wined3d_srv)
-        wined3d_shader_resource_view_decref(texture->wined3d_srv);
     /* If the texture was managed, release the sysmem copy now. */
     if (texture->draw_texture)
         wined3d_texture_decref(texture->wined3d_texture);

[PATCH 4/4] wined3d: Set d3d 1-9 textures in the state as SRVs.

[Zebediah Figura]

From: Zebediah Figura

The idea is to reuse the existing code to handle SRVs, which simplifies the GL
code and essentially allows the Vulkan code to work "for free" (which is to say,
by writing this patch, rather than by adding support for flat textures to the
Vulkan renderer.)

This is a large patch; it consists the following parts:

* Create identity SRVs for d3d 1-9 textures. Store those in
  state->shader_resource_view instead of in state->texture.

* (Re)use wined3d_context_gl_bind_shader_resources() instead of state_sampler()
  to bind them.

- Introduce code to that function to handle FFP textures.

- Bind the sRGB texture if necessary in wined3d_shader_resource_view_gl_bind.

* (Re)use context_gl_load_shader_resources() instead of
  context_preload_textures() to load them.

- Introduce code to that function to handle FFP textures.

- Load the sRGB texture if necessary.

- Port the SRV/RTV feedback loop check from context_preload_textures().

* Invalidate STATE_GRAPHICS_SHADER_RESOURCE_BINDING in places that now need to
  account for texture binding being guarded by that state instead of
  STATE_SAMPLER.

Transitioning the remaining users of STATE_SAMPLER to
  STATE_GRAPHICS_SHADER_RESOURCE_BINDING, and removing STATE_SAMPLER, is left
  for future patches.
---
 dlls/wined3d/context.c         | 71 ------------------------
 dlls/wined3d/context_gl.c      | 75 +++++++++++++++++++++++++-
 dlls/wined3d/cs.c              | 99 +++++++++++++++++++---------------
 dlls/wined3d/device.c          | 13 -----
 dlls/wined3d/state.c           | 82 +---------------------------
 dlls/wined3d/stateblock.c      | 37 +++++++------
 dlls/wined3d/texture.c         |  8 +--
 dlls/wined3d/view.c            |  2 +-
 dlls/wined3d/wined3d_private.h | 11 ++--
 9 files changed, 156 insertions(+), 242 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index ce3c18be4f1..90a588415ea 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -333,74 +333,3 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi
             context->use_immediate_mode_draw = TRUE;
     }
 }
-
-static bool is_resource_rtv_bound(const struct wined3d_state *state,
-        const struct wined3d_resource *resource)
-{
-    unsigned int i;
-
-    if (!resource->rtv_bind_count_device)
-        return false;
-
-    for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i)
-    {
-        if (state->fb.render_targets[i] && state->fb.render_targets[i]->resource == resource)
-            return true;
-    }
-
-    return false;
-}
-
-/* Context activation is done by the caller. */
-static void context_preload_texture(struct wined3d_context *context,
-        const struct wined3d_state *state, enum wined3d_shader_type shader_type, unsigned int idx)
-{
-    struct wined3d_texture *texture;
-    unsigned int texture_idx = idx;
-
-    if (shader_type == WINED3D_SHADER_TYPE_VERTEX)
-        texture_idx += WINED3D_VERTEX_SAMPLER_OFFSET;
-
-    if (!(texture = state->textures[texture_idx]))
-        return;
-
-    if (is_resource_rtv_bound(state, &texture->resource)
-            || (state->fb.depth_stencil && state->fb.depth_stencil->resource == &texture->resource))
-        context->uses_fbo_attached_resources = 1;
-
-    wined3d_texture_load(texture, context, state->sampler[shader_type][idx]->desc.srgb_decode);
-}
-
-/* Context activation is done by the caller. */
-void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state)
-{
-    unsigned int i;
-
-    if (use_vs(state))
-    {
-        for (i = 0; i < WINED3D_MAX_VERTEX_SAMPLERS; ++i)
-        {
-            if (state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info[i].type)
-                context_preload_texture(context, state, WINED3D_SHADER_TYPE_VERTEX, i);
-        }
-    }
-
-    if (use_ps(state))
-    {
-        for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i)
-        {
-            if (state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info[i].type)
-                context_preload_texture(context, state, WINED3D_SHADER_TYPE_PIXEL, i);
-        }
-    }
-    else
-    {
-        uint32_t ffu_map = context->fixed_function_usage_map;
-
-        while (ffu_map)
-        {
-            i = wined3d_bit_scan(&ffu_map);
-            context_preload_texture(context, state, WINED3D_SHADER_TYPE_PIXEL, i);
-        }
-    }
-}
diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c
index bdea2879a51..31379040669 100644
--- a/dlls/wined3d/context_gl.c
+++ b/dlls/wined3d/context_gl.c
@@ -3808,6 +3808,7 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex
             {
                 wined3d_context_gl_map_stage(context_gl, i, i);
                 context_invalidate_state(&context_gl->c, STATE_SAMPLER(i));
+                context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING);
                 context_invalidate_texture_stage(&context_gl->c, i);
             }
         }
@@ -3823,6 +3824,7 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex
         {
             wined3d_context_gl_map_stage(context_gl, i, tex);
             context_invalidate_state(&context_gl->c, STATE_SAMPLER(i));
+            context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING);
             context_invalidate_texture_stage(&context_gl->c, i);
         }

@@ -3843,6 +3845,7 @@ static void wined3d_context_gl_map_psamplers(struct wined3d_context_gl *context_
         {
             wined3d_context_gl_map_stage(context_gl, i, i);
             context_invalidate_state(&context_gl->c, STATE_SAMPLER(i));
+            context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING);
             if (i < d3d_info->ffp_fragment_caps.max_blend_stages)
                 context_invalidate_texture_stage(&context_gl->c, i);
         }
@@ -3905,6 +3908,7 @@ static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_
                     {
                         wined3d_context_gl_map_stage(context_gl, vsampler_idx, start);
                         context_invalidate_state(&context_gl->c, STATE_SAMPLER(vsampler_idx));
+                        context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING);
                     }

--start;
@@ -3975,7 +3979,27 @@ static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *
     struct wined3d_sampler *sampler;

if (!(shader = state->shader[shader_type]))
+    {
+        if (shader_type == WINED3D_SHADER_TYPE_PIXEL)
+        {
+            uint32_t ffu_map = context_gl->c.fixed_function_usage_map;
+
+            while (ffu_map)
+            {
+                i = wined3d_bit_scan(&ffu_map);
+                bind_idx = context_gl->tex_unit_map[i];
+
+                view = state->shader_resource_view[WINED3D_SHADER_TYPE_PIXEL][i];
+                sampler = state->sampler[WINED3D_SHADER_TYPE_PIXEL][i];
+
+                if (view)
+                    wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view),
+                            bind_idx, wined3d_sampler_gl(sampler), context_gl);
+            }
+        }
+
         return;
+    }

tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl,
             &shader->reg_maps.shader_version, &base, &count);
@@ -4061,12 +4085,32 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex
     checkGLcall("Bind unordered access views");
 }

+static bool is_resource_rtv_bound(const struct wined3d_state *state, const struct wined3d_resource *resource)
+{
+    unsigned int i;
+
+    if (state->fb.depth_stencil && state->fb.depth_stencil->resource == resource)
+        return true;
+
+    if (!resource->rtv_bind_count_device)
+        return false;
+
+    for (i = 0; i < ARRAY_SIZE(state->fb.render_targets); ++i)
+    {
+        if (state->fb.render_targets[i] && state->fb.render_targets[i]->resource == resource)
+            return true;
+    }
+
+    return false;
+}
+
 static void context_gl_load_shader_resources(struct wined3d_context_gl *context_gl,
         const struct wined3d_state *state, unsigned int shader_mask)
 {
     struct wined3d_shader_sampler_map_entry *entry;
     struct wined3d_shader_resource_view_gl *srv_gl;
     struct wined3d_shader_resource_view *view;
+    struct wined3d_sampler *sampler;
     struct wined3d_shader *shader;
     struct wined3d_buffer *buffer;
     unsigned int i, j;
@@ -4077,7 +4121,26 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_
             continue;

if (!(shader = state->shader[i]))
+        {
+            if (i == WINED3D_SHADER_TYPE_PIXEL)
+            {
+                uint32_t ffu_map = context_gl->c.fixed_function_usage_map;
+
+                while (ffu_map)
+                {
+                    i = wined3d_bit_scan(&ffu_map);
+
+                    view = state->shader_resource_view[WINED3D_SHADER_TYPE_PIXEL][i];
+                    sampler = state->sampler[WINED3D_SHADER_TYPE_PIXEL][i];
+
+                    if (view)
+                        wined3d_texture_load(texture_from_resource(view->resource),
+                                &context_gl->c, sampler->desc.srgb_decode);
+                }
+            }
+
             continue;
+        }

for (j = 0; j < WINED3D_MAX_CBS; ++j)
         {
@@ -4098,6 +4161,9 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_
             if (!(view = state->shader_resource_view[i][entry->resource_idx]))
                 continue;

+            if (is_resource_rtv_bound(state, view->resource))
+                context_gl->c.uses_fbo_attached_resources = 1;
+
             if (view->resource->type == WINED3D_RTYPE_BUFFER)
             {
                 buffer = buffer_from_resource(view->resource);
@@ -4110,7 +4176,13 @@ static void context_gl_load_shader_resources(struct wined3d_context_gl *context_
             }
             else
             {
-                wined3d_texture_load(texture_from_resource(view->resource), &context_gl->c, FALSE);
+                BOOL srgb = TRUE;
+
+                if (entry->sampler_idx != WINED3D_SAMPLER_DEFAULT
+                        && (sampler = state->sampler[i][entry->sampler_idx]))
+                    srgb = sampler->desc.srgb_decode;
+
+                wined3d_texture_load(texture_from_resource(view->resource), &context_gl->c, srgb);
             }
         }
     }
@@ -4207,7 +4279,6 @@ static BOOL context_apply_draw_state(struct wined3d_context *context,
      * result in changes to the current FBO, due to using e.g. FBO blits for
      * updating a resource location. */
     wined3d_context_gl_update_tex_unit_map(context_gl, state);
-    context_preload_textures(context, state);
     context_gl_load_shader_resources(context_gl, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE));
     context_gl_load_unordered_access_resources(context_gl, state->shader[WINED3D_SHADER_TYPE_PIXEL],
             state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]);
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index 84c025ff46c..7c6e465844c 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -270,8 +270,9 @@ struct wined3d_cs_set_constant_buffers
 struct wined3d_cs_set_texture
 {
     enum wined3d_cs_op opcode;
-    UINT stage;
-    struct wined3d_texture *texture;
+    enum wined3d_shader_type shader_type;
+    unsigned int bind_index;
+    struct wined3d_shader_resource_view *view;
 };

struct wined3d_cs_set_color_key
@@ -1036,11 +1037,6 @@ static void reference_graphics_pipeline_resources(struct wined3d_device_context
         if (state->stream_output[i].buffer)
             wined3d_device_context_reference_resource(context, &state->stream_output[i].buffer->resource);
     }
-    for (i = 0; i < ARRAY_SIZE(state->textures); ++i)
-    {
-        if (state->textures[i])
-            wined3d_device_context_reference_resource(context, &state->textures[i]->resource);
-    }
     for (i = 0; i < d3d_info->limits.max_rt_count; ++i)
     {
         if (state->fb.render_targets[i])
@@ -1454,8 +1450,8 @@ void wined3d_device_context_emit_set_constant_buffers(struct wined3d_device_cont
     wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
 }

-static bool texture_binding_might_invalidate_ps(struct wined3d_texture *texture,
-        struct wined3d_texture *prev, const struct wined3d_d3d_info *d3d_info)
+static bool texture_binding_might_invalidate_ps(struct wined3d_shader_resource_view *view,
+        struct wined3d_shader_resource_view *prev, const struct wined3d_d3d_info *d3d_info)
 {
     unsigned int old_usage, new_usage, old_caps, new_caps;
     const struct wined3d_format *old_format, *new_format;
@@ -1464,16 +1460,16 @@ static bool texture_binding_might_invalidate_ps(struct wined3d_texture *texture,
         return true;

/* 1.x pixel shaders need to be recompiled based on the resource type. */
-    old_usage = prev->resource.usage;
-    new_usage = texture->resource.usage;
-    if (texture->resource.type != prev->resource.type
+    old_usage = prev->resource->usage;
+    new_usage = view->resource->usage;
+    if (view->resource->type != prev->resource->type
             || ((old_usage & WINED3DUSAGE_LEGACY_CUBEMAP) != (new_usage & WINED3DUSAGE_LEGACY_CUBEMAP)))
         return true;

-    old_format = prev->resource.format;
-    new_format = texture->resource.format;
-    old_caps = prev->resource.format_caps;
-    new_caps = texture->resource.format_caps;
+    old_format = prev->resource->format;
+    new_format = view->resource->format;
+    old_caps = prev->resource->format_caps;
+    new_caps = view->resource->format_caps;
     if ((old_caps & WINED3D_FORMAT_CAP_SHADOW) != (new_caps & WINED3D_FORMAT_CAP_SHADOW))
         return true;

@@ -1490,47 +1486,61 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data)
 {
     const struct wined3d_d3d_info *d3d_info = &cs->c.device->adapter->d3d_info;
     const struct wined3d_cs_set_texture *op = data;
-    struct wined3d_texture *prev;
+    struct wined3d_shader_resource_view *prev;
     BOOL old_use_color_key = FALSE, new_use_color_key = FALSE;

-    prev = cs->state.textures[op->stage];
-    cs->state.textures[op->stage] = op->texture;
+    prev = cs->state.shader_resource_view[op->shader_type][op->bind_index];
+    cs->state.shader_resource_view[op->shader_type][op->bind_index] = op->view;

-    if (op->texture)
+    if (op->view)
     {
-        ++op->texture->resource.bind_count;
+        struct wined3d_texture *texture = texture_from_resource(op->view->resource);

-        if (texture_binding_might_invalidate_ps(op->texture, prev, d3d_info))
-            device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL));
+        ++op->view->resource->bind_count;

-        if (!prev && op->stage < d3d_info->ffp_fragment_caps.max_blend_stages)
+        if (op->shader_type == WINED3D_SHADER_TYPE_PIXEL)
         {
-            /* The source arguments for color and alpha ops have different
-             * meanings when a NULL texture is bound, so the COLOR_OP and
-             * ALPHA_OP have to be dirtified. */
-            device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_COLOR_OP));
-            device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_ALPHA_OP));
-        }
+            if (texture_binding_might_invalidate_ps(op->view, prev, d3d_info))
+                device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL));

-        if (!op->stage && op->texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT)
-            new_use_color_key = TRUE;
+            if (!prev && op->bind_index < d3d_info->ffp_fragment_caps.max_blend_stages)
+            {
+                /* The source arguments for color and alpha ops have different
+                 * meanings when a NULL texture is bound, so the COLOR_OP and
+                 * ALPHA_OP have to be dirtified. */
+                device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->bind_index, WINED3D_TSS_COLOR_OP));
+                device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->bind_index, WINED3D_TSS_ALPHA_OP));
+            }
+
+            if (!op->bind_index && texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT)
+                new_use_color_key = TRUE;
+        }
     }

if (prev)
     {
-        --prev->resource.bind_count;
+        struct wined3d_texture *prev_texture = texture_from_resource(prev->resource);
+
+        --prev->resource->bind_count;

-        if (!op->texture && op->stage < d3d_info->ffp_fragment_caps.max_blend_stages)
+        if (op->shader_type == WINED3D_SHADER_TYPE_PIXEL)
         {
-            device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_COLOR_OP));
-            device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->stage, WINED3D_TSS_ALPHA_OP));
-        }
+            if (!op->view && op->bind_index < d3d_info->ffp_fragment_caps.max_blend_stages)
+            {
+                device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->bind_index, WINED3D_TSS_COLOR_OP));
+                device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->bind_index, WINED3D_TSS_ALPHA_OP));
+            }

-        if (!op->stage && prev->async.color_key_flags & WINED3D_CKEY_SRC_BLT)
-            old_use_color_key = TRUE;
+            if (!op->bind_index && prev_texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT)
+                old_use_color_key = TRUE;
+        }
     }

-    device_invalidate_state(cs->c.device, STATE_SAMPLER(op->stage));
+    if (op->shader_type == WINED3D_SHADER_TYPE_VERTEX)
+        device_invalidate_state(cs->c.device, STATE_SAMPLER(WINED3D_VERTEX_SAMPLER_OFFSET + op->bind_index));
+    else
+        device_invalidate_state(cs->c.device, STATE_SAMPLER(op->bind_index));
+    device_invalidate_state(cs->c.device, STATE_GRAPHICS_SHADER_RESOURCE_BINDING);

if (new_use_color_key != old_use_color_key)
         device_invalidate_state(cs->c.device, STATE_RENDER(WINED3D_RS_COLORKEYENABLE));
@@ -1539,15 +1549,16 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data)
         device_invalidate_state(cs->c.device, STATE_COLOR_KEY);
 }

-void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage,
-        struct wined3d_texture *texture)
+void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context,
+        enum wined3d_shader_type shader_type, unsigned int bind_index, struct wined3d_shader_resource_view *view)
 {
     struct wined3d_cs_set_texture *op;

op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT);
     op->opcode = WINED3D_CS_OP_SET_TEXTURE;
-    op->stage = stage;
-    op->texture = texture;
+    op->shader_type = shader_type;
+    op->bind_index = bind_index;
+    op->view = view;

wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT);
 }
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 21848f9cea4..201b76eab28 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5108,19 +5108,6 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso

switch (type)
     {
-        case WINED3D_RTYPE_TEXTURE_1D:
-        case WINED3D_RTYPE_TEXTURE_2D:
-        case WINED3D_RTYPE_TEXTURE_3D:
-            for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i)
-            {
-                if (&state->textures[i]->resource == resource)
-                {
-                    ERR("Texture resource %p is still in use, stage %u.\n", resource, i);
-                    state->textures[i] = NULL;
-                }
-            }
-            break;
-
         case WINED3D_RTYPE_BUFFER:
             for (i = 0; i < WINED3D_MAX_STREAMS; ++i)
             {
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 87fa7c454fe..6f7c10f1123 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -3453,61 +3453,6 @@ static void sampler_texmatrix(struct wined3d_context *context, const struct wine
     }
 }

-/* Enabling and disabling texture dimensions is done by texture stage state /
- * pixel shader setup, this function only has to bind textures and set the per
- * texture states. */
-static void sampler(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
-{
-    struct wined3d_context_gl *context_gl = wined3d_context_gl(context);
-    unsigned int sampler_idx = state_id - STATE_SAMPLER(0);
-    unsigned int mapped_stage = context_gl->tex_unit_map[sampler_idx];
-    const struct wined3d_gl_info *gl_info = context_gl->gl_info;
-
-    TRACE("Sampler %u.\n", sampler_idx);
-
-    if (mapped_stage == WINED3D_UNMAPPED_STAGE)
-    {
-        TRACE("No sampler mapped to stage %u. Returning.\n", sampler_idx);
-        return;
-    }
-
-    if (mapped_stage >= gl_info->limits.graphics_samplers)
-        return;
-    wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage);
-
-    if (state->textures[sampler_idx])
-    {
-        struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(state->textures[sampler_idx]);
-        enum wined3d_shader_type shader_type = WINED3D_SHADER_TYPE_PIXEL;
-        unsigned int bind_idx = sampler_idx;
-        struct wined3d_sampler *sampler;
-
-        if (sampler_idx >= WINED3D_VERTEX_SAMPLER_OFFSET)
-        {
-            bind_idx -= WINED3D_VERTEX_SAMPLER_OFFSET;
-            shader_type = WINED3D_SHADER_TYPE_VERTEX;
-        }
-
-        sampler = state->sampler[shader_type][bind_idx];
-
-        wined3d_texture_gl_bind(texture_gl, context_gl, sampler->desc.srgb_decode);
-        wined3d_sampler_gl_bind(wined3d_sampler_gl(sampler), mapped_stage, texture_gl, context_gl);
-
-        /* Trigger shader constant reloading (for NP2 texcoord fixup) */
-        if (!(texture_gl->t.flags & WINED3D_TEXTURE_POW2_MAT_IDENT))
-            context->constant_update_mask |= WINED3D_SHADER_CONST_PS_NP2_FIXUP;
-    }
-    else
-    {
-        wined3d_context_gl_bind_texture(context_gl, GL_NONE, 0);
-        if (gl_info->supported[ARB_SAMPLER_OBJECTS])
-        {
-            GL_EXTCALL(glBindSampler(mapped_stage, 0));
-            checkGLcall("glBindSampler");
-        }
-    }
-}
-
 void apply_pixelshader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)
 {
     unsigned int i;
@@ -3519,11 +3464,7 @@ void apply_pixelshader(struct wined3d_context *context, const struct wined3d_sta
             /* Former draw without a pixel shader, some samplers may be
              * disabled because of WINED3D_TSS_COLOR_OP = WINED3DTOP_DISABLE
              * make sure to enable them. */
-            for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i)
-            {
-                if (!isStateDirty(context, STATE_SAMPLER(i)))
-                    sampler(context, state, STATE_SAMPLER(i));
-            }
+            context->update_shader_resource_bindings = 1;
             context->last_was_pshader = TRUE;
         }
         else
@@ -4496,27 +4437,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] =
     { STATE_RENDER(WINED3D_RS_DITHERENABLE),              { STATE_RENDER(WINED3D_RS_DITHERENABLE),              state_ditherenable  }, WINED3D_GL_EXT_NONE             },
     { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS),      { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS),      state_msaa          }, ARB_MULTISAMPLE                 },
     { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS),      { STATE_RENDER(WINED3D_RS_MULTISAMPLEANTIALIAS),      state_msaa_w        }, WINED3D_GL_EXT_NONE             },
-    /* Samplers */
-    { STATE_SAMPLER(0),                                   { STATE_SAMPLER(0),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(1),                                   { STATE_SAMPLER(1),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(2),                                   { STATE_SAMPLER(2),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(3),                                   { STATE_SAMPLER(3),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(4),                                   { STATE_SAMPLER(4),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(5),                                   { STATE_SAMPLER(5),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(6),                                   { STATE_SAMPLER(6),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(7),                                   { STATE_SAMPLER(7),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(8),                                   { STATE_SAMPLER(8),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(9),                                   { STATE_SAMPLER(9),                                   sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(10),                                  { STATE_SAMPLER(10),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(11),                                  { STATE_SAMPLER(11),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(12),                                  { STATE_SAMPLER(12),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(13),                                  { STATE_SAMPLER(13),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(14),                                  { STATE_SAMPLER(14),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(15),                                  { STATE_SAMPLER(15),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(16), /* Vertex sampler 0 */           { STATE_SAMPLER(16),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(17), /* Vertex sampler 1 */           { STATE_SAMPLER(17),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(18), /* Vertex sampler 2 */           { STATE_SAMPLER(18),                                  sampler             }, WINED3D_GL_EXT_NONE             },
-    { STATE_SAMPLER(19), /* Vertex sampler 3 */           { STATE_SAMPLER(19),                                  sampler             }, WINED3D_GL_EXT_NONE             },
     { STATE_BASEVERTEXINDEX,                              { STATE_BASEVERTEXINDEX,                              state_nop,          }, ARB_DRAW_ELEMENTS_BASE_VERTEX   },
     { STATE_BASEVERTEXINDEX,                              { STATE_STREAMSRC,                                    NULL,               }, WINED3D_GL_EXT_NONE             },
     { STATE_FRAMEBUFFER,                                  { STATE_FRAMEBUFFER,                                  context_state_fb    }, WINED3D_GL_EXT_NONE             },
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 6361de4909b..a17e166bad6 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -431,7 +431,6 @@ void state_unbind_resources(struct wined3d_state *state)
     struct wined3d_blend_state *blend_state;
     struct wined3d_rendertarget_view *rtv;
     struct wined3d_sampler *sampler;
-    struct wined3d_texture *texture;
     struct wined3d_buffer *buffer;
     struct wined3d_shader *shader;
     unsigned int i, j;
@@ -442,15 +441,6 @@ void state_unbind_resources(struct wined3d_state *state)
         wined3d_vertex_declaration_decref(decl);
     }

-    for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i)
-    {
-        if ((texture = state->textures[i]))
-        {
-            state->textures[i] = NULL;
-            wined3d_texture_decref(texture);
-        }
-    }
-
     for (i = 0; i < WINED3D_MAX_STREAM_OUTPUT_BUFFERS; ++i)
     {
         if ((buffer = state->stream_output[i].buffer))
@@ -2530,28 +2520,37 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device
 static void wined3d_device_set_texture(struct wined3d_device *device,
         unsigned int stage, struct wined3d_texture *texture)
 {
+    enum wined3d_shader_type shader_type = WINED3D_SHADER_TYPE_PIXEL;
+    struct wined3d_shader_resource_view *srv = NULL, *prev;
     struct wined3d_state *state = device->cs->c.state;
-    struct wined3d_texture *prev;

TRACE("device %p, stage %u, texture %p.\n", device, stage, texture);

-    prev = state->textures[stage];
+    if (stage >= WINED3D_VERTEX_SAMPLER_OFFSET)
+    {
+        shader_type = WINED3D_SHADER_TYPE_VERTEX;
+        stage -= WINED3D_VERTEX_SAMPLER_OFFSET;
+    }
+
+    if (texture && !(srv = wined3d_texture_acquire_identity_srv(texture)))
+        return;
+
+    prev = state->shader_resource_view[shader_type][stage];
     TRACE("Previous texture %p.\n", prev);

-    if (texture == prev)
+    if (srv == prev)
     {
         TRACE("App is setting the same texture again, nothing to do.\n");
         return;
     }

-    TRACE("Setting new texture to %p.\n", texture);
-    state->textures[stage] = texture;
+    state->shader_resource_view[shader_type][stage] = srv;

-    if (texture)
-        wined3d_texture_incref(texture);
-    wined3d_device_context_emit_set_texture(&device->cs->c, stage, texture);
+    if (srv)
+        wined3d_shader_resource_view_incref(srv);
+    wined3d_device_context_emit_set_texture(&device->cs->c, shader_type, stage, srv);
     if (prev)
-        wined3d_texture_decref(prev);
+        wined3d_shader_resource_view_decref(prev);

return;
 }
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 722c3db23b2..1b6b7681a33 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -3509,7 +3509,6 @@ static void texture_resource_unload(struct wined3d_resource *resource)
 {
     struct wined3d_texture *texture = texture_from_resource(resource);
     struct wined3d_device *device = resource->device;
-    const struct wined3d_state *state = &device->cs->state;
     unsigned int location = resource->map_binding;
     struct wined3d_context *context;
     unsigned int sub_count, i;
@@ -3555,11 +3554,8 @@ static void texture_resource_unload(struct wined3d_resource *resource)

wined3d_texture_force_reload(texture);

-    for (i = 0; i < ARRAY_SIZE(state->textures); ++i)
-    {
-        if (state->textures[i] == texture)
-            device_invalidate_state(device, STATE_SAMPLER(i));
-    }
+    if (texture->resource.bind_count && (texture->resource.bind_flags & WINED3D_BIND_SHADER_RESOURCE))
+        device_invalidate_state(device, STATE_GRAPHICS_SHADER_RESOURCE_BINDING);

wined3d_texture_set_dirty(texture);

diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c
index 4b0ccea7bb2..dcc779881c6 100644
--- a/dlls/wined3d/view.c
+++ b/dlls/wined3d/view.c
@@ -1264,7 +1264,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl
     }

texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource));
-    wined3d_texture_gl_bind(texture_gl, context_gl, FALSE);
+    wined3d_texture_gl_bind(texture_gl, context_gl, sampler_gl->s.desc.srgb_decode);
     wined3d_sampler_gl_bind(sampler_gl, unit, texture_gl, context_gl);

/* Trigger shader constant reloading (for NP2 texcoord fixup) */
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index eda3a515ea7..665d278a23d 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1976,7 +1976,6 @@ struct wined3d_context

void wined3d_context_cleanup(struct wined3d_context *context) DECLSPEC_HIDDEN;
 void wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;
-void context_preload_textures(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;
 void context_update_stream_info(struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d,
@@ -2884,7 +2883,6 @@ struct wined3d_state
     struct wined3d_shader_resource_view *shader_resource_view[WINED3D_SHADER_TYPE_COUNT][MAX_SHADER_RESOURCE_VIEWS];
     struct wined3d_unordered_access_view *unordered_access_view[WINED3D_PIPELINE_COUNT][MAX_UNORDERED_ACCESS_VIEWS];

-    struct wined3d_texture *textures[WINED3D_MAX_COMBINED_SAMPLERS];
     uint32_t texture_states[WINED3D_MAX_FFP_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1];

struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1];
@@ -3730,8 +3728,9 @@ void wined3d_device_context_emit_set_stream_outputs(struct wined3d_device_contex
         const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_stream_sources(struct wined3d_device_context *context,
         unsigned int start_idx, unsigned int count, const struct wined3d_stream_state *streams) DECLSPEC_HIDDEN;
-void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage,
-        struct wined3d_texture *texture) DECLSPEC_HIDDEN;
+void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context,
+        enum wined3d_shader_type shader_type, unsigned int bind_index,
+        struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_texture_state(struct wined3d_device_context *context, unsigned int stage,
         enum wined3d_texture_stage_state state, unsigned int value) DECLSPEC_HIDDEN;
 void wined3d_device_context_emit_set_transform(struct wined3d_device_context *context,
@@ -3940,8 +3939,10 @@ void wined3d_shader_resource_view_cleanup(struct wined3d_shader_resource_view *v

static inline struct wined3d_texture *wined3d_state_get_ffp_texture(const struct wined3d_state *state, unsigned int idx)
 {
+    struct wined3d_shader_resource_view *view = state->shader_resource_view[WINED3D_SHADER_TYPE_PIXEL][idx];
+
     assert(idx <= WINED3D_MAX_FFP_TEXTURES);
-    return state->textures[idx];
+    return view ? texture_from_resource(view->resource) : NULL;
 }

struct wined3d_unordered_access_view

[PATCH 4/4] wined3d: Set d3d 1-9 textures in the state as SRVs.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=140049

Your paranoid android.

=== debian11b (64 bit WoW report) ===

d3d10core:
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 17: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 18: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 33: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 34: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 45: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 46: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 47: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 48: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 75: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 76: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 77: Got unexpected color 0x800000ff at (3, 3).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (0, 0).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (1, 0).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (2, 0).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (3, 0).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (0, 1).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (1, 1).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (2, 1).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (3, 1).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (0, 2).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (1, 2).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (2, 2).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (3, 2).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (0, 3).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (1, 3).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (2, 3).
d3d10core.c:7672: Test failed: Test 78: Got unexpected color 0x800000ff at (3, 3).

d3d11:
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 21: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 22: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 41: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 42: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 53: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 54: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 55: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 56: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 83: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 84: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 85: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (0, 0).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (1, 0).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (2, 0).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (3, 0).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (0, 1).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (1, 1).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (2, 1).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (3, 1).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (0, 2).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (1, 2).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (2, 2).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (3, 2).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (0, 3).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (1, 3).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (2, 3).
d3d11.c:10070: Test failed: Test 86: Got unexpected colour 0x800000ff at (3, 3).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (0, 0).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (1, 0).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (2, 0).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (3, 0).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (0, 1).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (1, 1).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (2, 1).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (3, 1).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (0, 2).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (1, 2).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (2, 2).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (3, 2).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (0, 3).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (1, 3).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (2, 3).
d3d11.c:32607: Test failed: Got unexpected colour 0xff8080ff at (3, 3).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (0, 0).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (1, 0).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (2, 0).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (3, 0).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (0, 1).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (1, 1).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (2, 1).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (3, 1).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (0, 2).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (1, 2).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (2, 2).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (3, 2).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (0, 3).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (1, 3).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (2, 3).
d3d11.c:32619: Test failed: Got unexpected colour 0xff8080ff at (3, 3).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (0, 0).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (1, 0).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (2, 0).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (3, 0).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (0, 1).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (1, 1).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (2, 1).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (3, 1).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (0, 2).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (1, 2).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (2, 2).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (3, 2).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (0, 3).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (1, 3).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (2, 3).
d3d11.c:32638: Test failed: Got unexpected colour 0xffc0c0ff at (3, 3).

Report validation errors:
d3d10core:d3d10core prints too much data (35621 bytes)

[Matteo Bruni (＠Mystral)]

Matteo Bruni (@Mystral) commented about dlls/wined3d/wined3d_private.h:
>  unsigned int row_pitch;
>  unsigned int slice_pitch;
>
> - struct wined3d_shader_resource_view *identity_srv;
> -

I don't see anything releasing this (but I'm also reading this patch from gitlab so I'm not exactly confident about it).

[Zebediah Figura (＠zfigura)]

> I don't see anything releasing this (but I'm also reading this patch from gitlab so I'm not exactly confident about it).

Ugh, you're right, and, what's worse, there's currently a reference cycle, since the SRV holds a reference to the texture.

I'm not sure what the best way to address this is. We could add a flag that suppresses the view -> texture reference for this case, which isn't great. Or we could duplicate basically all this logic into every frontend, including feeding it through the stateblocks, which seems even worse.

[Zebediah Figura (＠zfigura)]

> We could add a flag that suppresses the view -> texture reference for this case, which isn't great.

I tried to do this and it ends up getting bad. The big problem is we need to absolutely make sure that the resource is released after all the views are dead, which is a lot harder to guarantee if the views aren't holding a reference. The last straw, that made me decide to abandon this, was the case where the last reference to a resource is dropped while a view is still bound to the device state (i.e. the texture has already been unset in the stateblock but the stateblock hasn't been applied yet).

I see a few paths forward, and I'd appreciate opinions from other d3d developers, since I don't really know what's best:

* Feed SRVs instead of textures through wined3d_stateblock? This does result in some unfortunate duplication, though.

- Also, it was my tentative plan to implement texture LODs as *non-identity* SRVs, again doing this translation at stateblock application. [For GL, if we don't have ARB_texture_view, we'd detect the case where a view differs only by level bounds and set GL_TEXTURE_BASE_LEVEL.] Possibly we could also do sRGB toggle this way, but that's less trivial because GL_TEXTURE_SRGB_DECODE_EXT is a sampler state.

If we do this, we'll probably (but maybe not?) want to cache these views rather than creating them every time.

The idea here is again to let Vulkan work "for free", but on the other hand, it doesn't really help the GL side (unlike this patch series), so it ends up being a complexity trade, and maybe we don't actually want to do this part. One potential reason the trade is worthwhile though is that it avoids letting that extra logic exist on potentially hot paths for d3d10+, but I don't know if that's a real benefit worth considering.

* Just create the views every time instead of caching them? I worry about the performance impact of this. I can't claim to have measured it, though.

* Throw out this patch series and keep state->textures around. Not thrilled about this option though; I think the code simplification is a pretty substantial improvement.

* Create a high level texture object for d3d 1-9. Not sure how to name this. It would contain a wined3d_texture and the cached SRV(s), as well as the texture LOD, and probably the managed textures (CPU vs GPU) factored out from d3d8/9. Stateblocks would deal in these instead of wined3d_texture directly. I like this option architecturally, but it does mean more boilerplate, and adding new layers and structure like this is not something that should be taken lightly.

[Henri Verbeet (＠hverbeet)]

I'm not saying it would be pretty, but perhaps we could forward references to such identity views to their corresponding resources, much like how surfaces/textures/swapchains work in d3d8 and d3d9.

[Zebediah Figura (＠zfigura)]

> I'm not saying it would be pretty, but perhaps we could forward references to such identity views to their corresponding resources, much like how surfaces/textures/swapchains work in d3d8 and d3d9.

Hmm, I don't dislike that. I actually removed that swapchain code in 2cfd75f7c5b, but that was for reasons that wouldn't apply here.