=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Enable sRGB decode.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Feb 8 10:09:22 CST 2016
Module: wine
Branch: master
Commit: e6b7ad8e45e51663702e620af1a1ada959123c1e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b7ad8e45e51663702e620af1a1ada959123c1e
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Feb 8 00:04:38 2016 +0100
d3d11: Enable sRGB decode.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d11/state.c | 2 +-
dlls/wined3d/device.c | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c
index 3ec9b1f..2fc0297 100644
--- a/dlls/d3d11/state.c
+++ b/dlls/d3d11/state.c
@@ -1195,7 +1195,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic
wined3d_desc.max_anisotropy = D3D11_DECODE_IS_ANISOTROPIC_FILTER(desc->Filter) ? desc->MaxAnisotropy : 1;
wined3d_desc.compare = wined3d_texture_compare_from_d3d11(desc->Filter);
wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc);
- wined3d_desc.srgb_decode = FALSE;
+ wined3d_desc.srgb_decode = TRUE;
if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, state, &state->wined3d_sampler)))
{
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 8a97183..18fdc1d 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -788,10 +788,6 @@ static void create_default_sampler(struct wined3d_device *device)
checkGLcall("glGenSamplers");
GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST));
GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST));
- if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE])
- {
- GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT));
- }
checkGLcall("glSamplerParamteri");
}
else
More information about the wine-cvs
mailing list