wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Stefan Dösinger : wined3d: Add support for GL_EXT_texture_snorm.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 6df52ca7e680498face4a5d80c4e0d2a64bd68fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df52ca7e680498face4a5d80… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:38 2015 +0100 wined3d: Add support for GL_EXT_texture_snorm. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/utils.c | 57 +++++++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d04d52..3667840 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -196,6 +196,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, {"GL_EXT_texture_lod_bias", EXT_TEXTURE_LOD_BIAS }, {"GL_EXT_texture_mirror_clamp", EXT_TEXTURE_MIRROR_CLAMP }, + {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 791ddf3..5cd52b3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1065,6 +1065,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R8G8_SNORM, GL_RG8_SNORM, GL_RG8_SNORM, 0, + GL_RG, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, GL_RGB5, GL_RGB5, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, 2, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -1095,6 +1100,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8_SNORM, GL_RGBA8_SNORM, 0, + GL_RGBA, GL_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, {WINED3DFMT_R16G16_SNORM, GL_RGB16, GL_RGB16, 0, GL_BGR, GL_UNSIGNED_SHORT, 6, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -1105,6 +1115,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_BUMPMAP, NV_TEXTURE_SHADER, NULL}, + {WINED3DFMT_R16G16_SNORM, GL_RG16_SNORM, GL_RG16_SNORM, 0, + GL_RG, GL_SHORT, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_BUMPMAP, + EXT_TEXTURE_SNORM, NULL}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, @@ -1978,57 +1993,51 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - /* V8U8 is supported natively by GL_ATI_envmap_bumpmap and GL_NV_texture_shader. - * V16U16 is only supported by GL_NV_texture_shader. The formats need fixup if - * their extensions are not available. GL_ATI_envmap_bumpmap is not used because - * the only driver that implements it(fglrx) has a buggy implementation. - * - * V8U8 and V16U16 need a fixup of the undefined blue channel. OpenGL - * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader - * conversion for this format. - */ - if (!gl_info->supported[NV_TEXTURE_SHADER]) + /* GL_ATI_envmap_bumpmap in theory supports R8G8_SNORM but is no longer supported by + * any driver. */ + if (gl_info->supported[NV_TEXTURE_SHADER] || gl_info->supported[EXT_TEXTURE_SNORM]) { + /* R8G8_SNORM and R16G16_SNORM need a fixup of the undefined blue channel. OpenGL + * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader + * conversion for this format. */ idx = getFmtIdx(WINED3DFMT_R8G8_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R16G16_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else { + /* Emulate using unsigned formats. This requires load-time conversion in addition to the + * fixups here. */ idx = getFmtIdx(WINED3DFMT_R8G8_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R16G16_SNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); + idx = getFmtIdx(WINED3DFMT_R8G8B8A8_SNORM); + gl_info->formats[idx].color_fixup = create_color_fixup_desc( + 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { - /* If GL_NV_texture_shader is not supported, those formats are converted, incompatibly - * with each other - */ + /* If GL_NV_texture_shader is not supported, R5G5_SNORM_L6_UNORM and R8G8_SNORM_L8X8_UNORM + * are converted, incompatiby with each other. */ idx = getFmtIdx(WINED3DFMT_R5G5_SNORM_L6_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); idx = getFmtIdx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); gl_info->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); - idx = getFmtIdx(WINED3DFMT_R8G8B8A8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( - 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); } else { /* If GL_NV_texture_shader is supported, WINED3DFMT_L6V5U5 and WINED3DFMT_X8L8V8U8 * are converted at surface loading time, but they do not need any modification in - * the shader, thus they are compatible with all WINED3DFMT_UNKNOWN group formats. - * WINED3DFMT_Q8W8V8U8 doesn't even need load-time conversion - */ + * the shader, thus they are compatible with all WINED3DFMT_UNKNOWN group formats. */ } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 48d25b0..4919cf6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -130,6 +130,7 @@ enum wined3d_gl_extension EXT_TEXTURE_FILTER_ANISOTROPIC, EXT_TEXTURE_LOD_BIAS, EXT_TEXTURE_MIRROR_CLAMP, + EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, EXT_VERTEX_ARRAY_BGRA,

1 0

Stefan Dösinger : d3d9/tests: Add a test for signed formats.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: cdb7e825ceb112c5ec13c7a8d49603b8fb7a7b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdb7e825ceb112c5ec13c7a8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:37 2015 +0100 d3d9/tests: Add a test for signed formats. --- dlls/d3d9/tests/visual.c | 507 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 383 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdb7e825ceb112c5ec13c…

1 0

Stefan Dösinger : wined3d: Improve the unsigned emulation of WINED3DFMT_R5G5_SNORM_L6_UNORM.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 6f2f73a456fe10493c9a79a94fbf0b48f8e563ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2f73a456fe10493c9a79a94… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:36 2015 +0100 wined3d: Improve the unsigned emulation of WINED3DFMT_R5G5_SNORM_L6_UNORM. --- dlls/wined3d/utils.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5f35ffb..791ddf3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -294,25 +294,29 @@ static void convert_r5g5_snorm_l6_unorm(const BYTE *src, BYTE *dst, UINT src_row UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { unsigned int x, y, z; - const WORD *Source; + unsigned char r_in, g_in, l_in; + const unsigned short *texel_in; + unsigned short *texel_out; + /* Emulating signed 5 bit values with unsigned 5 bit values has some precision problems by design: + * E.g. the signed input value 0 becomes 16. GL normalizes it to 16 / 31 = 0.516. We convert it + * back to a signed value by subtracting 0.5 and multiplying by 2.0. The resulting value is + * ((16 / 31) - 0.5) * 2.0 = 0.032, which is quite different from the intended result 0.000. */ for (z = 0; z < depth; z++) { for (y = 0; y < height; y++) { - unsigned short *Dest_s = (unsigned short *) (dst + z * dst_slice_pitch + y * dst_row_pitch); - Source = (const WORD *)(src + z * src_slice_pitch + y * src_row_pitch); + texel_out = (unsigned short *) (dst + z * dst_slice_pitch + y * dst_row_pitch); + texel_in = (const unsigned short *)(src + z * src_slice_pitch + y * src_row_pitch); for (x = 0; x < width; x++ ) { - short color = (*Source++); - unsigned char l = ((color >> 10) & 0xfc); - short v = ((color >> 5) & 0x3e); - short u = ((color ) & 0x1f); - short v_conv = v + 16; - short u_conv = u + 16; - - *Dest_s = ((v_conv << 11) & 0xf800) | ((l << 5) & 0x7e0) | (u_conv & 0x1f); - Dest_s += 1; + l_in = (*texel_in & 0xfc00) >> 10; + g_in = (*texel_in & 0x03e0) >> 5; + r_in = *texel_in & 0x001f; + + *texel_out = ((r_in + 16) << 11) | (l_in << 5) | (g_in + 16); + texel_out++; + texel_in++; } } }

1 0

Stefan Dösinger : wined3d: Properly up-scale WINED3DFMT_R5G5_SNORM_L6_UNORM.
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: ce836bf6516389725b26b853deb4109682605e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce836bf6516389725b26b853d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 7 10:03:35 2015 +0100 wined3d: Properly up-scale WINED3DFMT_R5G5_SNORM_L6_UNORM. --- dlls/wined3d/utils.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1ce23ac..5f35ffb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -322,8 +322,8 @@ static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_ UINT dst_row_pitch, UINT dst_slice_pitch, UINT width, UINT height, UINT depth) { unsigned int x, y, z; - const WORD *Source; - unsigned char *Dest; + unsigned char *texel_out, ds_out, dt_out, r_in, g_in, l_in; + const unsigned short *texel_in; /* This makes the gl surface bigger(24 bit instead of 16), but it works with * fixed function and shaders without further conversion once the surface is @@ -333,27 +333,28 @@ static void convert_r5g5_snorm_l6_unorm_nv(const BYTE *src, BYTE *dst, UINT src_ { for (y = 0; y < height; y++) { - Source = (const WORD *)(src + z * src_slice_pitch + y * src_row_pitch); - Dest = dst + z * dst_slice_pitch + y * dst_row_pitch; + texel_in = (const unsigned short *)(src + z * src_slice_pitch + y * src_row_pitch); + texel_out = dst + z * dst_slice_pitch + y * dst_row_pitch; for (x = 0; x < width; x++ ) { - short color = (*Source++); - unsigned char l = ((color >> 10) & 0xfc); - char v = ((color >> 5) & 0x3e); - char u = ((color ) & 0x1f); + l_in = (*texel_in & 0xfc00) >> 10; + g_in = (*texel_in & 0x03e0) >> 5; + r_in = *texel_in & 0x001f; - /* 8 bits destination, 6 bits source, 8th bit is the sign. gl ignores the sign - * and doubles the positive range. Thus shift left only once, gl does the 2nd - * shift. GL reads a signed value and converts it into an unsigned value. - */ - /* M */ Dest[2] = l << 1; + ds_out = r_in << 3; + if (!(r_in & 0x10)) /* r > 0 */ + ds_out |= r_in >> 1; - /* Those are read as signed, but kept signed. Just left-shift 3 times to scale - * from 5 bit values to 8 bit values. - */ - /* V */ Dest[1] = v << 3; - /* U */ Dest[0] = u << 3; - Dest += 3; + dt_out = g_in << 3; + if (!(g_in & 0x10)) /* g > 0 */ + dt_out |= g_in >> 1; + + texel_out[0] = ds_out; + texel_out[1] = dt_out; + texel_out[2] = l_in << 1 | l_in >> 5; + + texel_out += 3; + texel_in++; } } }

1 0

Bernhard Übelacker : wined3d: Recognize Nvidia GeForce 8100 with Nouveau driver (bug).
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 44ddcac6c372b003c81e36aa9f55bf32f5c0f8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ddcac6c372b003c81e36aa9… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Fri Mar 6 16:49:08 2015 +0100 wined3d: Recognize Nvidia GeForce 8100 with Nouveau driver (bug). --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 89996d1..6d04d52 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1203,6 +1203,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", DRIVER_NVIDIA_GEFORCE6, 256 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8200, "NVIDIA GeForce 8200", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", DRIVER_NVIDIA_GEFORCE8, 128 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8400GS, "NVIDIA GeForce 8400 GS", DRIVER_NVIDIA_GEFORCE8, 128 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, @@ -2070,7 +2071,7 @@ cards_nvidia_mesa[] = /* Tesla */ {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, {"NVAC", CARD_NVIDIA_GEFORCE_8200}, - {"NVAA", CARD_NVIDIA_GEFORCE_8200}, + {"NVAA", CARD_NVIDIA_GEFORCE_8200}, /* 8100 */ {"NVA8", CARD_NVIDIA_GEFORCE_210}, {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, {"NVA3", CARD_NVIDIA_GEFORCE_GT240},

1 0

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_SetPrivateDataInterface().
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 5b5498a8b4e0fe74517f3b98153c1291ec5bb346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5498a8b4e0fe74517f3b981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:58 2015 +0100 d3d10core: Implement d3d10_sampler_state_SetPrivateDataInterface(). --- dlls/d3d10core/state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 3e684f5..90e6938 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -594,9 +594,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateData(ID3D10Sample static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3D10SamplerState *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&state->private_store, guid, data); } /* ID3D10SamplerState methods */

1 0

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_SetPrivateData().
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 21d94883bcd8da242871f45d023e0ece724dacaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d94883bcd8da242871f45d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:57 2015 +0100 d3d10core: Implement d3d10_sampler_state_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/state.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 278e0db..51d021b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -296,6 +296,7 @@ struct d3d10_sampler_state ID3D10SamplerState ID3D10SamplerState_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_sampler *wined3d_sampler; D3D10_SAMPLER_DESC desc; struct wine_rb_entry entry; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 4d4c5ea..3e684f5 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -552,6 +552,7 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *i wined3d_sampler_decref(state->wined3d_sampler); wine_rb_remove(&device->sampler_states, &state->desc); ID3D10Device1_Release(state->device); + wined3d_private_store_cleanup(&state->private_store); HeapFree(GetProcessHeap(), 0, state); } @@ -582,10 +583,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10Sample static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateData(ID3D10SamplerState *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3D10SamplerState *iface, @@ -667,6 +670,7 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; + wined3d_private_store_init(&state->private_store); state->desc = *desc; wined3d_desc.address_u = wined3d_texture_address_from_d3d10core(desc->AddressU); @@ -687,6 +691,7 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, state, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); + wined3d_private_store_cleanup(&state->private_store); return hr; } @@ -694,6 +699,7 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, struct d3d10 { ERR("Failed to insert sampler state entry.\n"); wined3d_sampler_decref(state->wined3d_sampler); + wined3d_private_store_cleanup(&state->private_store); return E_FAIL; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_GetPrivateData ().
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 3b2c28d8cf567b9da9c99f201ccafe598a452912 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2c28d8cf567b9da9c99f201… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:56 2015 +0100 d3d10core: Implement d3d10_rasterizer_state_GetPrivateData(). --- dlls/d3d10core/state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 3f5a61e..4d4c5ea 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -415,10 +415,12 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerS static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_SetPrivateData ().
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: 7531acd360c9825e5e5eeee18c5cac2c575e407d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7531acd360c9825e5e5eeee18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:54 2015 +0100 d3d10core: Implement d3d10_rasterizer_state_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/state.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 2d2bf03..278e0db 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -280,6 +280,7 @@ struct d3d10_rasterizer_state ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; + struct wined3d_private_store private_store; D3D10_RASTERIZER_DESC desc; struct wine_rb_entry entry; ID3D10Device1 *device; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 52360c8..2ab2c97 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -393,6 +393,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt struct d3d10_device *device = impl_from_ID3D10Device(state->device); wine_rb_remove(&device->rasterizer_states, &state->desc); ID3D10Device1_Release(state->device); + wined3d_private_store_cleanup(&state->private_store); HeapFree(GetProcessHeap(), 0, state); } @@ -423,10 +424,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10Ras static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, @@ -469,11 +472,13 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; + wined3d_private_store_init(&state->private_store); state->desc = *desc; if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) { ERR("Failed to insert rasterizer state entry.\n"); + wined3d_private_store_cleanup(&state->private_store); return E_FAIL; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_SetPrivateDataInterface().
by Alexandre Julliard 10 Mar '15

10 Mar '15

Module: wine Branch: master Commit: da48976de97aa14bc7c70b52d904e3804e032313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da48976de97aa14bc7c70b52d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 10 11:41:55 2015 +0100 d3d10core: Implement d3d10_rasterizer_state_SetPrivateDataInterface(). --- dlls/d3d10core/state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 2ab2c97..3f5a61e 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -435,9 +435,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10Ras static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&state->private_store, guid, data); } /* ID3D10RasterizerState methods */

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015