June 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : mswsock: Build with msvcrt.
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: a0b03348ee1606a7a9fe2080db0c958f67546601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b03348ee1606a7a9fe2080… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:20:15 2019 +0200 mswsock: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mswsock/Makefile.in | 2 ++ dlls/mswsock/mswsock.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mswsock/Makefile.in b/dlls/mswsock/Makefile.in index 98c738f..a0cf70f 100644 --- a/dlls/mswsock/Makefile.in +++ b/dlls/mswsock/Makefile.in @@ -2,6 +2,8 @@ MODULE = mswsock.dll IMPORTLIB = mswsock IMPORTS = ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mswsock.c diff --git a/dlls/mswsock/mswsock.c b/dlls/mswsock/mswsock.c index 7851e8a..c53ecab 100644 --- a/dlls/mswsock/mswsock.c +++ b/dlls/mswsock/mswsock.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Zebediah Figura : strmbase: Factor out strmbase_source_cleanup().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 79ed388e70e16d9d273481d089ce2cbf1df45a1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=79ed388e70e16d9d273481d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:20 2019 -0500 strmbase: Factor out strmbase_source_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index eb0f469..f1b24c3 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -773,12 +773,17 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp return S_OK; } +static void strmbase_source_cleanup(BaseOutputPin *pin) +{ + FreeMediaType(&pin->pin.mtCurrent); + if (pin->pAllocator) + IMemAllocator_Release(pin->pAllocator); + pin->pAllocator = NULL; +} + HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; + strmbase_source_cleanup(This); CoTaskMemFree(This); return S_OK; }

1 0

Zebediah Figura : strmbase: Return void from OutputPin_Init().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 2922615d0288c1a30a2f0e8a96c72802a208c467 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2922615d0288c1a30a2f0e8a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:19 2019 -0500 strmbase: Return void from OutputPin_Init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index aa195c3..eb0f469 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -740,14 +740,12 @@ static void strmbase_pin_init(BasePin *pin, const IPinVtbl *vtbl, pin->pFuncsTable = func_table; } -static HRESULT OutputPin_Init(const IPinVtbl *vtbl, const PIN_INFO *info, - const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs, BaseOutputPin *pin) +static void strmbase_source_init(BaseOutputPin *pin, const IPinVtbl *vtbl, + const PIN_INFO *info, const BaseOutputPinFuncTable *func_table, CRITICAL_SECTION *cs) { memset(pin, 0, sizeof(*pin)); strmbase_pin_init(&pin->pin, vtbl, &func_table->base, info, cs); pin->pFuncsTable = func_table; - - return S_OK; } HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) @@ -770,14 +768,9 @@ HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outp if (!pPinImpl) return E_OUTOFMEMORY; - if (SUCCEEDED(OutputPin_Init(OutputPin_Vtbl, pPinInfo, vtbl, pCritSec, pPinImpl))) - { - *ppPin = &pPinImpl->pin.IPin_iface; - return S_OK; - } - - CoTaskMemFree(pPinImpl); - return E_FAIL; + strmbase_source_init(pPinImpl, OutputPin_Vtbl, pPinInfo, vtbl, pCritSec); + *ppPin = &pPinImpl->pin.IPin_iface; + return S_OK; } HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This)

1 0

Zebediah Figura : qcap/avimux: Use strmbase_sink_init() and heap_alloc_zero() in create_input_pin().
by Alexandre Julliard June 14, 2019

June 14, 2019

Module: wine Branch: master Commit: 81ec19dc4b725701b9d7593d016bd515b94b88ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=81ec19dc4b725701b9d7593d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 13 18:09:18 2019 -0500 qcap/avimux: Use strmbase_sink_init() and heap_alloc_zero() in create_input_pin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index d289d2b..9dcff50 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -139,7 +139,8 @@ static void avi_mux_destroy(BaseFilter *iface) IPin_Disconnect(&filter->in[i]->pin.pin.IPin_iface); IMemAllocator_Release(filter->in[i]->samples_allocator); filter->in[i]->samples_allocator = NULL; - BaseInputPinImpl_Release(&filter->in[i]->pin.pin.IPin_iface); + strmbase_sink_cleanup(&filter->in[i]->pin); + heap_free(filter->in[i]); } heap_free(filter->idx1); @@ -2214,6 +2215,7 @@ static const IQualityControlVtbl AviMuxIn_QualityControlVtbl = { static HRESULT create_input_pin(AviMux *avimux) { static const WCHAR name[] = {'I','n','p','u','t',' ','0','0',0}; + AviMuxIn *object; PIN_INFO info; HRESULT hr; @@ -2226,40 +2228,39 @@ static HRESULT create_input_pin(AviMux *avimux) info.achName[7] = '0' + (avimux->input_pin_no+1) % 10; info.achName[6] = '0' + (avimux->input_pin_no+1) / 10; - hr = BaseInputPin_Construct(&AviMuxIn_PinVtbl, sizeof(AviMuxIn), &info, - &AviMuxIn_BaseInputFuncTable, &avimux->filter.csFilter, NULL, (IPin**)&avimux->in[avimux->input_pin_no]); - if(FAILED(hr)) - return hr; - avimux->in[avimux->input_pin_no]->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; - avimux->in[avimux->input_pin_no]->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; - avimux->in[avimux->input_pin_no]->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; - avimux->in[avimux->input_pin_no]->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + strmbase_sink_init(&object->pin, &AviMuxIn_PinVtbl, &info, + &AviMuxIn_BaseInputFuncTable, &avimux->filter.csFilter, NULL); + object->pin.IMemInputPin_iface.lpVtbl = &AviMuxIn_MemInputPinVtbl; + object->IAMStreamControl_iface.lpVtbl = &AviMuxIn_AMStreamControlVtbl; + object->IPropertyBag_iface.lpVtbl = &AviMuxIn_PropertyBagVtbl; + object->IQualityControl_iface.lpVtbl = &AviMuxIn_QualityControlVtbl; - avimux->in[avimux->input_pin_no]->samples_head = NULL; hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, - &IID_IMemAllocator, (void**)&avimux->in[avimux->input_pin_no]->samples_allocator); - if(FAILED(hr)) { - BaseInputPinImpl_Release(&avimux->in[avimux->input_pin_no]->pin.pin.IPin_iface); + &IID_IMemAllocator, (void **)&object->samples_allocator); + if (FAILED(hr)) + { + strmbase_sink_cleanup(&object->pin); + heap_free(object); return hr; } hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, - &IID_IMemAllocator, (void**)&avimux->in[avimux->input_pin_no]->pin.pAllocator); - if(FAILED(hr)) { - IMemAllocator_Release(avimux->in[avimux->input_pin_no]->samples_allocator); - BaseInputPinImpl_Release(&avimux->in[avimux->input_pin_no]->pin.pin.IPin_iface); + &IID_IMemAllocator, (void **)&object->pin.pAllocator); + if (FAILED(hr)) + { + IMemAllocator_Release(object->samples_allocator); + strmbase_sink_cleanup(&object->pin); + heap_free(object); return hr; } - avimux->in[avimux->input_pin_no]->stream_time = 0; - memset(&avimux->in[avimux->input_pin_no]->strh, 0, sizeof(avimux->in[avimux->input_pin_no]->strh)); - avimux->in[avimux->input_pin_no]->strf = NULL; - memset(&avimux->in[avimux->input_pin_no]->indx_data, 0, sizeof(avimux->in[avimux->input_pin_no]->indx_data)); - memset(&avimux->in[avimux->input_pin_no]->ix_data, 0, sizeof(avimux->in[avimux->input_pin_no]->ix_data)); - avimux->in[avimux->input_pin_no]->indx = (AVISUPERINDEX*)&avimux->in[avimux->input_pin_no]->indx_data; - avimux->in[avimux->input_pin_no]->ix = (AVISTDINDEX*)avimux->in[avimux->input_pin_no]->ix_data; + object->indx = (AVISUPERINDEX *)&object->indx_data; + object->ix = (AVISTDINDEX *)object->ix_data; - avimux->input_pin_no++; + avimux->in[avimux->input_pin_no++] = object; return S_OK; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_attach_gl_texture_fbo().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: f7c80fae5159aef3f2e8ca7940aafdbc2a711c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c80fae5159aef3f2e8ca79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:37 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_attach_gl_texture_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a56576d..be34614 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -127,10 +127,10 @@ static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_inf } } -static void context_attach_gl_texture_fbo(struct wined3d_context *context, +static void wined3d_context_gl_attach_gl_texture_fbo(struct wined3d_context_gl *context_gl, GLenum fbo_target, GLenum attachment, const struct wined3d_fbo_resource *resource) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!resource) { @@ -177,6 +177,7 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, DWORD flags) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (resource->object) @@ -191,24 +192,24 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, else { if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, resource); if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, resource); } if (!(flags & WINED3D_FBO_ENTRY_FLAG_DEPTH)) - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, NULL); if (!(flags & WINED3D_FBO_ENTRY_FLAG_STENCIL)) - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } else { TRACE("Attach depth stencil 0.\n"); - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } } @@ -216,7 +217,8 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, static void context_attach_surface_fbo(struct wined3d_context *context, GLenum fbo_target, DWORD idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) { - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; TRACE("Attach GL object %u to %u.\n", resource->object, idx); @@ -230,12 +232,12 @@ static void context_attach_surface_fbo(struct wined3d_context *context, } else { - context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); } } else { - context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); } }

1 0

Paul Gofman : wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: 447c9523f84f8bc973a1080bb29d3b60e6d190f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=447c9523f84f8bc973a1080b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 13 16:56:59 2019 +0300 wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8848 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bb510ec..9202fb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4109,8 +4109,12 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", - src_param.param_str, src_param.param_str); + if (mask_size > 3) + shader_addline(buffer, "tmp0.x = dot(vec3(%s), vec3(%s));\n", + src_param.param_str, src_param.param_str); + else + shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", + src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); if (mask_size > 1)

1 0

Henri Verbeet : wined3d: Upload texture data through the texture ops in wined3d_texture_upload_from_texture ().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: eb5afc560cd87a5470a06b42eb36e4b619974eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5afc560cd87a5470a06b42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:39 2019 +0430 wined3d: Upload texture data through the texture ops in wined3d_texture_upload_from_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3f6d620..71bec04 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3850,15 +3850,15 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); else wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); src_level = src_sub_resource_idx % src_texture->level_count; wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); - wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, src_texture->resource.format, - src_box, wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, FALSE); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), + src_texture->resource.format, src_box, src_row_pitch, src_slice_pitch, dst_texture, + dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, dst_x, dst_y, dst_z); context_release(context);

1 0

Henri Verbeet : wined3d: Get rid of the unused "gl_info" argument to compute_texture_matrix().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: ec6a83013097b180afef97c6de6ec6cc048850e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6a83013097b180afef97c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:38 2019 +0430 wined3d: Get rid of the unused "gl_info" argument to compute_texture_matrix(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a83d444..44b6c48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5470,9 +5470,8 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w } /* Setup this textures matrix according to the texture flags. */ -static void compute_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wined3d_matrix *matrix, - DWORD flags, BOOL calculated_coords, BOOL transformed, enum wined3d_format_id format_id, - BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) +static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t flags, BOOL calculated_coords, + BOOL transformed, enum wined3d_format_id format_id, BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) { struct wined3d_matrix mat; @@ -5586,13 +5585,12 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine unsigned int tex, struct wined3d_matrix *mat) { const struct wined3d_device *device = context->device; - const struct wined3d_gl_info *gl_info = context->gl_info; BOOL generated = (state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0xffff0000) != WINED3DTSS_TCI_PASSTHRU; unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX & 0x0000ffff], WINED3D_MAX_TEXTURES - 1); - compute_texture_matrix(gl_info, &state->transforms[WINED3D_TS_TEXTURE0 + tex], + compute_texture_matrix(&state->transforms[WINED3D_TS_TEXTURE0 + tex], state->texture_states[tex][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], generated, context->last_was_rhw, context->stream_info.use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx))

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_set_compatible_renderbuffer ().
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: f3ee4d40ce79cfedba849b04827e864bf638c0e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3ee4d40ce79cfedba849b04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:35 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_set_compatible_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 76b5858..a56576d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -613,7 +613,7 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture), - &context_gl->c, ds_level, &render_targets[0]); + context_gl, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d3c58cb..3f6d620 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1452,9 +1452,9 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* Context activation is done by the caller. */ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) + struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_renderbuffer_entry *entry; unsigned int src_width, src_height; unsigned int width, height; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 91570ed..ece1aca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3626,7 +3626,7 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, unsigned int level, + struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; #define WINED3D_LOCATION_DISCARDED 0x00000001

1 0

Paul Gofman : wined3d: Do not zero 'w' with zero norm for 'nrm' opcode in GLSL backend.
by Alexandre Julliard June 13, 2019

June 13, 2019

Module: wine Branch: master Commit: c13351c05af43aa542938e0c0935b154a8166905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c13351c05af43aa542938e0c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 13 16:57:01 2019 +0300 wined3d: Do not zero 'w' with zero norm for 'nrm' opcode in GLSL backend. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9202fb6..326733d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4117,16 +4117,8 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); - if (mask_size > 1) - { - shader_addline(buffer, "tmp0.x == 0.0 ? vec%u(0.0) : (%s * inversesqrt(tmp0.x)));\n", - mask_size, src_param.param_str); - } - else - { - shader_addline(buffer, "tmp0.x == 0.0 ? 0.0 : (%s * inversesqrt(tmp0.x)));\n", - src_param.param_str); - } + shader_addline(buffer, "tmp0.x == 0.0 ? %s : (%s * inversesqrt(tmp0.x)));\n", + src_param.param_str, src_param.param_str); } static void shader_glsl_scalar_op(const struct wined3d_shader_instruction *ins)

1 0