system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 23:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

wined3d: Remove the no longer used "sampler" field of struct wined3d_texture.

Browse source
This commit is contained in:
Zebediah Figura 2023-03-09 18:55:52 -06:00 committed by Alexandre Julliard
parent 17542e9f52
commit b186455cfa
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dlls/wined3d/cs.c
View file

@ -1498,8 +1498,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data)
if (op->texture)
{
if (InterlockedIncrement(&op->texture->resource.bind_count) == 1)
op->texture->sampler = op->stage;
InterlockedIncrement(&op->texture->resource.bind_count);
if (texture_binding_might_invalidate_ps(op->texture, prev, d3d_info))
device_invalidate_state(cs->c.device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL));
@ -1519,23 +1518,7 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data)
if (prev)
{
if (InterlockedDecrement(&prev->resource.bind_count) && prev->sampler == op->stage)
{
unsigned int i;
/* Search for other stages the texture is bound to. Shouldn't
* happen if applications bind textures to a single stage only. */
TRACE("Searching for other stages the texture is bound to.\n");
for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i)
{
if (cs->state.textures[i] == prev)
{
TRACE("Texture is also bound to stage %u.\n", i);
prev->sampler = i;
break;
}
}
}
InterlockedDecrement(&prev->resource.bind_count);
if (!op->texture && op->stage < d3d_info->ffp_fragment_caps.max_blend_stages)
{

1
dlls/wined3d/wined3d_private.h
View file

@ -3329,7 +3329,6 @@ struct wined3d_texture
unsigned int sysmem_count;
float pow2_matrix[16];
unsigned int lod;
DWORD sampler;
uint32_t flags;
DWORD update_map_binding;