ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Use wined3d samplers unconditionally for applying legacy sampler states. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2017-03-20 12:13:07 +01:00 committed by Alexandre Julliard
parent 584ec259b2
commit 591a3b1be8
1 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/wined3d/state.c
View File

@ -3611,51 +3611,41 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state
if (state->textures[sampler_idx]) if (state->textures[sampler_idx])
{ {
struct wined3d_texture *texture = state->textures[sampler_idx];
BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE]; BOOL srgb = state->sampler_states[sampler_idx][WINED3D_SAMP_SRGB_TEXTURE];
const DWORD *sampler_states = state->sampler_states[sampler_idx]; const DWORD *sampler_states = state->sampler_states[sampler_idx];
struct wined3d_texture *texture = state->textures[sampler_idx];
struct wined3d_device *device = context->device;
struct wined3d_sampler_desc desc; struct wined3d_sampler_desc desc;
struct wined3d_sampler *sampler;
struct wine_rb_entry *entry;
struct gl_texture *gl_tex; struct gl_texture *gl_tex;
unsigned int base_level; unsigned int base_level;
wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture); wined3d_sampler_desc_from_sampler_states(&desc, context, sampler_states, texture);
wined3d_texture_bind(texture, context, srgb); wined3d_texture_bind(texture, context, srgb);
if (!gl_info->supported[ARB_SAMPLER_OBJECTS])
if ((entry = wine_rb_get(&device->samplers, &desc)))
{ {
wined3d_texture_apply_sampler_desc(texture, &desc, context); sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry);
} }
else else
{ {
struct wined3d_device *device = context->device; if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler)))
struct wined3d_sampler *sampler;
struct wine_rb_entry *entry;
if ((entry = wine_rb_get(&device->samplers, &desc)))
{ {
sampler = WINE_RB_ENTRY_VALUE(entry, struct wined3d_sampler, entry); ERR("Failed to create sampler.\n");
sampler = NULL;
} }
else else
{ {
if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1)
{ ERR("Failed to insert sampler.\n");
ERR("Failed to create sampler.\n");
sampler = NULL;
}
else
{
if (wine_rb_put(&device->samplers, &desc, &sampler->entry) == -1)
ERR("Failed to insert sampler.\n");
}
}
if (sampler)
{
GL_EXTCALL(glBindSampler(mapped_stage, sampler->name));
checkGLcall("glBindSampler");
} }
} }
if (sampler)
wined3d_sampler_bind(sampler, mapped_stage, texture, context);
if (texture->flags & WINED3D_TEXTURE_COND_NP2) if (texture->flags & WINED3D_TEXTURE_COND_NP2)
base_level = 0; base_level = 0;
else if (desc.mip_filter == WINED3D_TEXF_NONE) else if (desc.mip_filter == WINED3D_TEXF_NONE)