March 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Add shader_reg_maps_add_tgsm() helper function.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: fdca95efae785f7d07b156cdd7a76c5f145be108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdca95efae785f7d07b156cdd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:39 2017 +0100 wined3d: Add shader_reg_maps_add_tgsm() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 82 ++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f79a922..a97dfb1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -863,6 +863,33 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN } } +static HRESULT shader_reg_maps_add_tgsm(struct wined3d_shader_reg_maps *reg_maps, + unsigned int register_idx, unsigned int size, unsigned int stride) +{ + struct wined3d_shader_tgsm *tgsm; + + if (register_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", register_idx); + return S_OK; + } + if (reg_maps->shader_version.type != WINED3D_SHADER_TYPE_COMPUTE) + { + FIXME("TGSM declarations are allowed only in compute shaders.\n"); + return S_OK; + } + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + register_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + + reg_maps->tgsm_count = register_idx + 1; + tgsm = &reg_maps->tgsm[register_idx]; + tgsm->size = size; + tgsm->stride = stride; + return S_OK; +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -875,6 +902,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st struct wined3d_shader_version shader_version; const DWORD *ptr; unsigned int i; + HRESULT hr; memset(reg_maps, 0, sizeof(*reg_maps)); memset(input_signature_elements, 0, sizeof(input_signature_elements)); @@ -1049,55 +1077,17 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) { - unsigned int reg_idx = ins.declaration.tgsm_raw.reg.reg.idx[0].offset; - if (reg_idx >= MAX_TGSM_REGISTERS) - { - ERR("Invalid TGSM register index %u.\n", reg_idx); - break; - } - if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) - { - struct wined3d_shader_tgsm *tgsm; - - if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, - reg_idx + 1, sizeof(*reg_maps->tgsm))) - return E_OUTOFMEMORY; - reg_maps->tgsm_count = reg_idx + 1; - tgsm = &reg_maps->tgsm[reg_idx]; - tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; - tgsm->stride = 0; - } - else - { - FIXME("Invalid instruction %#x for shader type %#x.\n", - ins.handler_idx, shader_version.type); - } + if (FAILED(hr = shader_reg_maps_add_tgsm(reg_maps, ins.declaration.tgsm_raw.reg.reg.idx[0].offset, + ins.declaration.tgsm_raw.byte_count / 4, 0))) + return hr; } else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) { - unsigned int reg_idx = ins.declaration.tgsm_structured.reg.reg.idx[0].offset; - if (reg_idx >= MAX_TGSM_REGISTERS) - { - ERR("Invalid TGSM register index %u.\n", reg_idx); - break; - } - if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) - { - struct wined3d_shader_tgsm *tgsm; - - if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, - reg_idx + 1, sizeof(*reg_maps->tgsm))) - return E_OUTOFMEMORY; - reg_maps->tgsm_count = reg_idx + 1; - tgsm = &reg_maps->tgsm[reg_idx]; - tgsm->stride = ins.declaration.tgsm_structured.byte_stride / 4; - tgsm->size = tgsm->stride * ins.declaration.tgsm_structured.structure_count; - } - else - { - FIXME("Invalid instruction %#x for shader type %#x.\n", - ins.handler_idx, shader_version.type); - } + unsigned int stride = ins.declaration.tgsm_structured.byte_stride / 4; + unsigned int size = stride * ins.declaration.tgsm_structured.structure_count; + if (FAILED(hr = shader_reg_maps_add_tgsm(reg_maps, + ins.declaration.tgsm_structured.reg.reg.idx[0].offset, size, stride))) + return hr; } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) {

1 0

Józef Kucia : wined3d: Add support for ld_raw on thread group shared memory.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 3ab2482e0bfee233bd14da72671ebba7c07a8eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab2482e0bfee233bd14da726… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:40 2017 +0100 wined3d: Add support for ld_raw on thread group shared memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3f73201..c65bc69 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5148,7 +5148,7 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) function = "texelFetch"; resource = "sampler"; } - else + else if (src->reg.type == WINED3DSPR_UAV) { if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) { @@ -5160,6 +5160,18 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) function = "imageLoad"; resource = "image"; } + else + { + if (resource_idx >= reg_maps->tgsm_count) + { + ERR("Invalid TGSM index %u.\n", resource_idx); + return; + } + stride = reg_maps->tgsm[resource_idx].stride; + bind_idx = resource_idx; + function = NULL; + resource = "g"; + } address = string_buffer_get(priv->string_buffers); if (ins->handler_idx == WINED3DSIH_LD_STRUCTURED) @@ -5178,8 +5190,12 @@ static void shader_glsl_ld_buffer(const struct wined3d_shader_instruction *ins) continue; swizzle = shader_glsl_swizzle_get_component(src->swizzle, i); - shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", - function, prefix, resource, bind_idx, address->buffer, swizzle); + if (function) + shader_addline(buffer, "%s(%s_%s%u, %s + %u).x);\n", + function, prefix, resource, bind_idx, address->buffer, swizzle); + else + shader_addline(buffer, "%s_%s%u[%s + %u]);\n", + prefix, resource, bind_idx, address->buffer, swizzle); } string_buffer_release(priv->string_buffers, address);

1 0

Huw Davies : dsound: Pass sample count to the normfunction.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: e6f8f136fa557d282f44654be509573cb45a831f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f8f136fa557d282f44654be… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:01:00 2017 +0000 dsound: Pass sample count to the normfunction. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 27 ++++++++++++--------------- dlls/dsound/mixer.c | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 0c9a34b..6887bae 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -286,10 +286,10 @@ void mixieee32(float *src, float *dst, unsigned samples) *(dst++) += *(src++); } -static void norm8(float *src, unsigned char *dst, unsigned len) +static void norm8(float *src, unsigned char *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_8(*src); ++dst; @@ -297,11 +297,10 @@ static void norm8(float *src, unsigned char *dst, unsigned len) } } -static void norm16(float *src, SHORT *dst, unsigned len) +static void norm16(float *src, SHORT *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 2; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_16(*src); ++dst; @@ -309,11 +308,10 @@ static void norm16(float *src, SHORT *dst, unsigned len) } } -static void norm24(float *src, BYTE *dst, unsigned len) +static void norm24(float *src, BYTE *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 3; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { LONG t = f_to_24(*src); dst[0] = (t >> 8) & 0xFF; @@ -324,11 +322,10 @@ static void norm24(float *src, BYTE *dst, unsigned len) } } -static void norm32(float *src, INT *dst, unsigned len) +static void norm32(float *src, INT *dst, unsigned samples) { - TRACE("%p - %p %d\n", src, dst, len); - len /= 4; - while (len--) + TRACE("%p - %p %d\n", src, dst, samples); + while (samples--) { *dst = f_to_32(*src); ++dst; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 049a345..1180594 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -716,7 +716,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* do the mixing */ DSOUND_MixToPrimary(device, (float*)device->buffer, frames, &all_stopped); - device->normfunction(device->buffer, buffer, frames * block); + device->normfunction(device->buffer, buffer, frames * device->pwfx->nChannels); } hr = IAudioRenderClient_ReleaseBuffer(device->render, frames, 0);

1 0

Huw Davies : dsound: Don' t propagate writepos in the non-WRITEPRIMARY case - it's unused.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 7a27cc89aae052ebac3a88f590610791b15c03bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a27cc89aae052ebac3a88f59… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 1 16:00:58 2017 +0000 dsound: Don't propagate writepos in the non-WRITEPRIMARY case - it's unused. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 2550753..174d56c 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -487,10 +487,9 @@ static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames) * (and it is not looping). * * dsb = the secondary buffer to mix from - * writepos = position (offset) in device buffer to write at * fraglen = number of bytes to mix */ -static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD writepos, DWORD fraglen) +static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD fraglen) { INT len = fraglen; float *ibuf; @@ -498,7 +497,7 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, UINT frames = fraglen / dsb->device->pwfx->nBlockAlign; TRACE("sec_mixpos=%d/%d\n", dsb->sec_mixpos, dsb->buflen); - TRACE("(%p,%d,%d)\n",dsb,writepos,fraglen); + TRACE("(%p,%d)\n",dsb,fraglen); if (len % dsb->device->pwfx->nBlockAlign) { INT nBlockAlign = dsb->device->pwfx->nBlockAlign; @@ -532,18 +531,16 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, * * dsb = the secondary buffer * playpos = the current play position in the device buffer (primary buffer) - * writepos = the current safe-to-write position in the device buffer * mixlen = the maximum number of bytes in the primary buffer to mix, from the * current writepos. * * Returns: the number of bytes beyond the writepos that were mixed. */ -static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD writepos, DWORD mixlen) +static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD mixlen) { DWORD primary_done = 0; - TRACE("(%p,%d,%d)\n",dsb,writepos,mixlen); - TRACE("writepos=%d, mixlen=%d\n", writepos, mixlen); + TRACE("(%p,%d)\n",dsb,mixlen); TRACE("looping=%d, leadin=%d\n", dsb->playflags, dsb->leadin); /* If leading in, only mix about 20 ms, and 'skip' mixing the rest, for more fluid pointer advancement */ @@ -552,7 +549,6 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD if (mixlen > 2 * dsb->device->fraglen) { primary_done = mixlen - 2 * dsb->device->fraglen; mixlen = 2 * dsb->device->fraglen; - writepos += primary_done; dsb->sec_mixpos += (primary_done / dsb->device->pwfx->nBlockAlign) * dsb->pwfx->nBlockAlign * dsb->freqAdjustNum / dsb->freqAdjustDen; } @@ -565,7 +561,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD /* First try to mix to the end of the buffer if possible * Theoretically it would allow for better optimization */ - primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, writepos, mixlen); + primary_done += DSOUND_MixInBuffer(dsb, mix_buffer, mixlen); TRACE("total mixed data=%d\n", primary_done); @@ -577,7 +573,6 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD * For a DirectSoundDevice, go through all the currently playing buffers and * mix them in to the device buffer. * - * writepos = the current safe-to-write position in the primary buffer * mixlen = the maximum amount to mix into the primary buffer * (beyond the current writepos) * all_stopped = reports back if all buffers have stopped @@ -585,7 +580,7 @@ static DWORD DSOUND_MixOne(IDirectSoundBufferImpl *dsb, float *mix_buffer, DWORD * Returns: the length beyond the writepos that was mixed to. */ -static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buffer, DWORD writepos, DWORD mixlen, BOOL *all_stopped) +static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buffer, DWORD mixlen, BOOL *all_stopped) { INT i; IDirectSoundBufferImpl *dsb; @@ -593,7 +588,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff /* unless we find a running buffer, all have stopped */ *all_stopped = TRUE; - TRACE("(%d,%d)\n", writepos, mixlen); + TRACE("(%d)\n", mixlen); for (i = 0; i < device->nrofbuffers; i++) { dsb = device->buffers[i]; @@ -613,7 +608,7 @@ static void DSOUND_MixToPrimary(const DirectSoundDevice *device, float *mix_buff dsb->state = STATE_PLAYING; /* mix next buffer into the main buffer */ - DSOUND_MixOne(dsb, mix_buffer, writepos, mixlen); + DSOUND_MixOne(dsb, mix_buffer, mixlen); *all_stopped = FALSE; } @@ -671,7 +666,7 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - UINT32 pad, maxq, writepos; + UINT32 pad, maxq; DWORD block; HRESULT hr; @@ -701,8 +696,6 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (maxq > device->fraglen * 3) maxq = device->fraglen * 3; - writepos = (device->playpos + pad) % device->buflen; - if (device->priolevel != DSSCL_WRITEPRIMARY) { BOOL all_stopped = FALSE; int nfiller; @@ -726,12 +719,12 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) memset(buffer, nfiller, maxq); if (!device->normfunction) - DSOUND_MixToPrimary(device, buffer, writepos, maxq, &all_stopped); + DSOUND_MixToPrimary(device, buffer, maxq, &all_stopped); else { memset(device->buffer, nfiller, device->buflen); /* do the mixing */ - DSOUND_MixToPrimary(device, (float*)device->buffer, writepos, maxq, &all_stopped); + DSOUND_MixToPrimary(device, (float*)device->buffer, maxq, &all_stopped); device->normfunction(device->buffer, buffer, maxq); } @@ -742,6 +735,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) device->pad += maxq; } else if (!device->stopped) { + DWORD writepos = (device->playpos + pad) % device->buflen; + if (maxq > device->buflen) maxq = device->buflen; if (writepos + maxq > device->buflen) {

1 0

Józef Kucia : wined3d: Handle structured thread group shared memory declarations.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 7590a94dab25d1aeddbb053f46918efaf0ec4b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7590a94dab25d1aeddbb053f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:38 2017 +0100 wined3d: Handle structured thread group shared memory declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a034ba2..3f73201 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9462,7 +9462,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ shader_glsl_nop, - /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, + /* WINED3DSIH_DCL_TGSM_STRUCTURED */ shader_glsl_nop, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_STRUCTURED */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1b245d4..f79a922 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1065,6 +1065,33 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st reg_maps->tgsm_count = reg_idx + 1; tgsm = &reg_maps->tgsm[reg_idx]; tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; + tgsm->stride = 0; + } + else + { + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_STRUCTURED) + { + unsigned int reg_idx = ins.declaration.tgsm_structured.reg.reg.idx[0].offset; + if (reg_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", reg_idx); + break; + } + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) + { + struct wined3d_shader_tgsm *tgsm; + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + reg_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + reg_maps->tgsm_count = reg_idx + 1; + tgsm = &reg_maps->tgsm[reg_idx]; + tgsm->stride = ins.declaration.tgsm_structured.byte_stride / 4; + tgsm->size = tgsm->stride * ins.declaration.tgsm_structured.structure_count; } else { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5cc0136..a934cdb 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -774,6 +774,8 @@ static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instructio shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_structured.reg); ins->declaration.tgsm_structured.byte_stride = *tokens++; ins->declaration.tgsm_structured.structure_count = *tokens; + if (ins->declaration.tgsm_structured.byte_stride % 4) + FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.tgsm_structured.byte_stride); } static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d06962..675dd50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1006,6 +1006,7 @@ struct wined3d_shader_structured_resource struct wined3d_shader_tgsm { unsigned int size; + unsigned int stride; }; struct wined3d_shader_tgsm_raw

1 0

Józef Kucia : wined3d: Handle raw thread group shared memory declarations.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: bd6ae2f459fd905a8e2a5143c08f3167e6ea527c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6ae2f459fd905a8e2a5143c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 28 14:42:37 2017 +0100 wined3d: Handle raw thread group shared memory declarations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 9 ++++++++- dlls/wined3d/shader.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 10 ++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0fd463d..a034ba2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6833,6 +6833,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; + unsigned int i; shader_id = GL_EXTCALL(glCreateShader(GL_COMPUTE_SHADER)); @@ -6846,6 +6847,12 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * priv_ctx.string_buffers = string_buffers; shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + for (i = 0; i < reg_maps->tgsm_count; ++i) + { + if (reg_maps->tgsm[i].size) + shader_addline(buffer, "shared uint cs_g%u[%u];\n", i, reg_maps->tgsm[i].size); + } + shader_addline(buffer, "layout(local_size_x = %u, local_size_y = %u, local_size_z = %u) in;\n", thread_group_size->x, thread_group_size->y, thread_group_size->z); @@ -9454,7 +9461,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, - /* WINED3DSIH_DCL_TGSM_RAW */ NULL, + /* WINED3DSIH_DCL_TGSM_RAW */ shader_glsl_nop, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index fa61674..1b245d4 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1047,6 +1047,31 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { reg_maps->temporary_count = ins.declaration.count; } + else if (ins.handler_idx == WINED3DSIH_DCL_TGSM_RAW) + { + unsigned int reg_idx = ins.declaration.tgsm_raw.reg.reg.idx[0].offset; + if (reg_idx >= MAX_TGSM_REGISTERS) + { + ERR("Invalid TGSM register index %u.\n", reg_idx); + break; + } + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) + { + struct wined3d_shader_tgsm *tgsm; + + if (!wined3d_array_reserve((void **)&reg_maps->tgsm, &reg_maps->tgsm_capacity, + reg_idx + 1, sizeof(*reg_maps->tgsm))) + return E_OUTOFMEMORY; + reg_maps->tgsm_count = reg_idx + 1; + tgsm = &reg_maps->tgsm[reg_idx]; + tgsm->size = ins.declaration.tgsm_raw.byte_count / 4; + } + else + { + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) { if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) @@ -1522,6 +1547,8 @@ static void shader_cleanup_reg_maps(struct wined3d_shader_reg_maps *reg_maps) LIST_FOR_EACH_ENTRY_SAFE(reg, reg_next, &reg_maps->indexable_temps, struct wined3d_shader_indexable_temp, entry) HeapFree(GetProcessHeap(), 0, reg); list_init(&reg_maps->indexable_temps); + + HeapFree(GetProcessHeap(), 0, reg_maps->tgsm); } unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_maps *reg_maps, unsigned int max) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 26aacc7..5cc0136 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -763,6 +763,8 @@ static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, { shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); ins->declaration.tgsm_raw.byte_count = *tokens; + if (ins->declaration.tgsm_raw.byte_count % 4) + FIXME("Byte count %u is not multiple of 4.\n", ins->declaration.tgsm_raw.byte_count); } static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instruction *ins, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79b0d1a..3d06962 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -185,6 +185,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 #define MAX_UNORDERED_ACCESS_VIEWS 8 +#define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 #define MAX_MULTISAMPLE_TYPES 8 @@ -915,6 +916,10 @@ struct wined3d_shader_reg_maps /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; UINT min_rel_offset, max_rel_offset; + + struct wined3d_shader_tgsm *tgsm; + SIZE_T tgsm_capacity; + unsigned int tgsm_count; }; /* Keeps track of details for TEX_M#x# instructions which need to maintain @@ -998,6 +1003,11 @@ struct wined3d_shader_structured_resource unsigned int byte_stride; }; +struct wined3d_shader_tgsm +{ + unsigned int size; +}; + struct wined3d_shader_tgsm_raw { struct wined3d_shader_dst_param reg;

1 0

Henri Verbeet : usp10: Make feature tables const.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 66df220c0059aead21ebf3fc625d9a01fa9d167e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66df220c0059aead21ebf3fc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 1 07:14:54 2017 +0100 usp10: Make feature tables const. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5c257dd..8daefcc 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -125,7 +125,7 @@ typedef void (*second_reorder_function)(LPWSTR pwChar, IndicSyllable *syllable,W typedef int (*combining_lexical_function)(WCHAR c); /* the orders of joined_forms and contextual_features need to line up */ -static const char* contextual_features[] = +static const char *const contextual_features[] = { "isol", "fina", @@ -168,7 +168,7 @@ static OPENTYPE_FEATURE_RECORD arabic_features[] = { MS_MAKE_TAG('m','s','e','t'), 1}, }; -static const char* required_arabic_features[] = +static const char *const required_arabic_features[] = { "fina", "init", @@ -205,7 +205,7 @@ static OPENTYPE_FEATURE_RECORD syriac_features[] = { MS_MAKE_TAG('d','l','i','g'), 1}, }; -static const char* required_syriac_features[] = +static const char *const required_syriac_features[] = { "fina", "fin2", @@ -263,13 +263,13 @@ static OPENTYPE_FEATURE_RECORD thai_gpos_features[] = { MS_MAKE_TAG('m','k','m','k'), 1}, }; -static const char* required_lao_features[] = +static const char *const required_lao_features[] = { "ccmp", NULL }; -static const char* required_devanagari_features[] = +static const char *const required_devanagari_features[] = { "nukt", "akhn", @@ -309,7 +309,7 @@ static OPENTYPE_FEATURE_RECORD myanmar_features[] = { MS_MAKE_TAG('c','l','i','g'), 1}, }; -static const char* required_bengali_features[] = +static const char *const required_bengali_features[] = { "nukt", "akhn", @@ -326,7 +326,7 @@ static const char* required_bengali_features[] = NULL }; -static const char* required_gurmukhi_features[] = +static const char *const required_gurmukhi_features[] = { "nukt", "akhn", @@ -345,7 +345,7 @@ static const char* required_gurmukhi_features[] = NULL }; -static const char* required_oriya_features[] = +static const char *const required_oriya_features[] = { "nukt", "akhn", @@ -362,7 +362,7 @@ static const char* required_oriya_features[] = NULL }; -static const char* required_tamil_features[] = +static const char *const required_tamil_features[] = { "nukt", "akhn", @@ -378,7 +378,7 @@ static const char* required_tamil_features[] = NULL }; -static const char* required_telugu_features[] = +static const char *const required_telugu_features[] = { "nukt", "akhn", @@ -405,7 +405,7 @@ static OPENTYPE_FEATURE_RECORD khmer_features[] = { MS_MAKE_TAG('c','l','i','g'), 1}, }; -static const char* required_khmer_features[] = +static const char *const required_khmer_features[] = { "pref", "blwf", @@ -446,7 +446,7 @@ static OPENTYPE_FEATURE_RECORD mongolian_features[] = typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; TEXTRANGE_PROPERTIES defaultGPOSTextRange; - const char** requiredFeatures; + const char *const *requiredFeatures; OPENTYPE_TAG newOtTag; ContextualShapingProc contextProc; ShapeCharGlyphPropProc charGlyphPropProc;

1 0

Francois Gouget : wbemprox: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: 34f77a656a69caaa0e2cfa2eaae426c223311c0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f77a656a69caaa0e2cfa2ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 28 18:52:45 2017 +0100 wbemprox: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/wbemprox_private.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index ba25a02..15ea9c6 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -227,27 +227,24 @@ HRESULT service_stop_service(IWbemClassObject *, IWbemClassObject *, IWbemClassO HRESULT security_get_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT security_set_sd(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; -static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc( void *mem, size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero( size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *heap_strdupW( const WCHAR *src )

1 0

Francois Gouget : wmiutils: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: b16f08b254d3199f51847acb2de6bd8061b76c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16f08b254d3199f51847acb2… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 28 18:52:53 2017 +0100 wmiutils: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmiutils/wmiutils_private.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 2b76f71..6782bd8 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -21,27 +21,24 @@ HRESULT WbemPath_create(LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemStatusCodeText_create(LPVOID *) DECLSPEC_HIDDEN; -static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc( void *mem, size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *strdupW( const WCHAR *src )

1 0

Bruno Jesus : wine.inf: Add RtlTryEnterCriticalSection to default RelayExclude.
by Alexandre Julliard March 1, 2017

March 1, 2017

Module: wine Branch: master Commit: c5bfbefacdab3c91fd84e8cede7f98eb6c4990a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bfbefacdab3c91fd84e8ced… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Tue Feb 28 18:19:01 2017 -0300 wine.inf: Add RtlTryEnterCriticalSection to default RelayExclude. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 18d8a49..0b3c940 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -530,7 +530,7 @@ HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" -HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" +HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlTryEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;winemac.drv;user32;gdi32;advapi32;kernel32" [DirectX]

1 0