September 2021 - Wine-Devel

[PATCH v2 3/3] gdi32: Use NtAllocateVirtualMemory to allocate GDI_SHARED_MEMORY.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdiobj.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)

Sept. 30, 2021

[PATCH v2 2/3] gdi32: Use NtAllocateVirtualMemory to alloc DC_ATTR.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Initialize the base pointer before NtAllocateVirtualMemory call. dlls/gdi32/dc.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-)

Sept. 30, 2021

[PATCH v2 1/3] gdi32: Use native memory allocators in Unix library.

by Jacek Caban

Sept. 30, 2021

[v2 PATCH vkd3d 2/2] vkd3d-shader: Allocate memory for a string buffer at init time.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Get rid of now unnecessary max() in vkd3d_string_buffer_resize() for the rc < 0 case. libs/vkd3d-shader/vkd3d_shader_main.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index baf25612..ef9eaef5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -25,7 +25,11 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { - memset(buffer, 0, sizeof(*buffer)); + buffer->buffer_size = 16; + buffer->content_size = 0; + buffer->buffer = vkd3d_malloc(buffer->buffer_size); + assert(buffer->buffer); + memset(buffer->buffer, 0, buffer->buffer_size); } void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) @@ -41,7 +45,7 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : buffer->buffer_size * 2; if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { @@ -58,9 +62,6 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char * va_list a; int rc; - if (!buffer->content_size && !vkd3d_string_buffer_resize(buffer, 32)) - return -1; - for (;;) { rem = buffer->buffer_size - buffer->content_size; @@ -144,11 +145,6 @@ struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_c if (!(buffer = vkd3d_malloc(sizeof(*buffer)))) return NULL; vkd3d_string_buffer_init(buffer); - if (!vkd3d_string_buffer_resize(buffer, 1)) - { - vkd3d_free(buffer); - return NULL; - } } else { -- 2.26.3

Sept. 30, 2021

[v4 PATCH vkd3d 1/2] vkd3d-shader: Don't resize the buffer when there is enough free space.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Handle rc < 0 case, use vkd3d_array_reserve(). v3: Fully make use of vkd3d_array_reserve() (thanks Henri). v4: Make buffer_size and content_size size_t. libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e38261b4..baf25612 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,20 +41,14 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = buffer->buffer_size * 2; - char *new_buffer; + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); - new_buffer_size = max(new_buffer_size, 32); - while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) - new_buffer_size *= 2; - if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) + if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return false; } - buffer->buffer = new_buffer; - buffer->buffer_size = new_buffer_size; return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8b3e7624..fa56ba1d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -912,8 +912,7 @@ void shader_sm4_reset(struct vkd3d_shader_parser *parser); struct vkd3d_string_buffer { char *buffer; - unsigned int buffer_size; - unsigned int content_size; + size_t buffer_size, content_size; }; struct vkd3d_string_buffer_cache -- 2.26.3

Sept. 30, 2021

Re: [PATCH 1/6] d3d10/effect: Go through both local and shared buffers when looking for shader resources.

by Matteo Bruni

On Thu, Sep 30, 2021 at 9:26 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > > > > On 9/30/21 10:18 PM, Matteo Bruni wrote: > > On Thu, Sep 30, 2021 at 9:11 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > >> > >> > >> On 9/30/21 10:03 PM, Matteo Bruni wrote: > >>> On Tue, Sep 28, 2021 at 2:23 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > >>>> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > >>>> --- > >>>> dlls/d3d10/effect.c | 56 ++++++++++++++++++++++++--------------- > >>>> dlls/d3d10/tests/effect.c | 53 +++++++++++++++++++++++++----------- > >>>> 2 files changed, 72 insertions(+), 37 deletions(-) > >>>> > >>>> diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c > >>>> index 668efcda666..71660eb399e 100644 > >>>> --- a/dlls/d3d10/effect.c > >>>> +++ b/dlls/d3d10/effect.c > >>>> @@ -526,6 +526,35 @@ static BOOL copy_name(const char *ptr, char **name) > >>>> return TRUE; > >>>> } > >>>> > >>>> +static struct d3d10_effect_variable * d3d10_effect_get_buffer_by_name(struct d3d10_effect *effect, > >>>> + const char *name) > >>>> +{ > >>>> + ID3D10EffectVariable *v; > >>>> + unsigned int i; > >>>> + > >>>> + for (i = 0; i < effect->local_buffer_count; ++i) > >>>> + { > >>>> + struct d3d10_effect_variable *l = &effect->local_buffers[i]; > >>>> + if (l->name && !strcmp(l->name, name)) > >>>> + { > >>>> + TRACE("Found local buffer %s.\n", debugstr_a(name)); > >>>> + return l; > >>>> + } > >>>> + } > >>>> + > >>>> + if (effect->pool) > >>>> + { > >>>> + if ((v = (ID3D10EffectVariable *)effect->pool->lpVtbl->GetConstantBufferByName(effect->pool, name)) > >>>> + && v->lpVtbl->IsValid(v)) > >>>> + { > >>>> + TRACE("Found shared buffer %s.\n", debugstr_a(name)); > >>>> + return impl_from_ID3D10EffectVariable(v); > >>>> + } > >>>> + } > >>>> + > >>>> + return NULL; > >>>> +} > >>>> + > >>> I wonder if it would be nicer to just loop through the pool effect's > >>> buffers instead, or at least call d3d10_effect_get_buffer_by_name() > >>> directly. > >> Yes, I have no problems with that. Making sure, do you mean storing > >> "struct d3d10_effect*" for pool, instead of an interface pointer? > > Probably, if it doesn't make other stuff more complicated (it shouldn't). > > I guess you could check that native doesn't support "custom" pools > > either, just to be sure that we won't ever need to go back on this. > I could try testing that, but that can only get so far, because internal > assumptions could be tricky to observe. For example, when you reference > a buffer from a child effect, and update it, there is not API way to > trigger d3d buffer update. Now that might go a "proper" way via some > internal interface, but given that even QueryInterface is not really > working, I'd be surprised they made such extra effort. Probably easiest > way is to try custom pool interface, and see if any methods are called > at all, expect for addref. If nothing gets called from top level object, > that obviously means such change will be safe. Yeah, I was thinking of something along those lines.

Sept. 30, 2021

Re: [PATCH 2/6] d3d10/effect: Go through both local and shared variables when looking for shader resources.

by Matteo Bruni

On Thu, Sep 30, 2021 at 9:16 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > > > > On 9/30/21 10:03 PM, Matteo Bruni wrote: > > BlendState s_blendstate; > -Texture s_texture; > +Texture2D s_texture; > PixelShader ps; > > I'm curious if that change made any difference. > > It has to match "shared" type I think. And I believe I had to change from "Texture", to get Load() call to compile. I have to admit, I don't understand what non-specific "Texture" type implies exactly. Does it mean I can use any texture type for it? Probably? It's to be figured out. FWIW compiling the same shader without the Texture -> Texture2D change with fxc gives me error X3087: texture object does not have methods which means the generic Texture object can't be used as is. Maybe it can be if it's "specialized" (e.g. by redeclaring it as a specific texture type) in the parent shader or something? > +float4 PS( float4 pos : SV_POSITION ) : SV_Target > +{ > + return s_texture.Load(int3(0,0,0)); > +} > + > +PixelShader vs = CompileShader(ps_4_0, PS()); > > Of course it doesn't matter but I'd rather not use "vs" for a pixel > shader variable name... > > Eh, of course.

Sept. 30, 2021

Re: [PATCH 1/6] d3d10/effect: Go through both local and shared buffers when looking for shader resources.

by Nikolay Sivov

On 9/30/21 10:18 PM, Matteo Bruni wrote: > On Thu, Sep 30, 2021 at 9:11 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >> >> >> On 9/30/21 10:03 PM, Matteo Bruni wrote: >>> On Tue, Sep 28, 2021 at 2:23 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: >>>> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> >>>> --- >>>> dlls/d3d10/effect.c | 56 ++++++++++++++++++++++++--------------- >>>> dlls/d3d10/tests/effect.c | 53 +++++++++++++++++++++++++----------- >>>> 2 files changed, 72 insertions(+), 37 deletions(-) >>>> >>>> diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c >>>> index 668efcda666..71660eb399e 100644 >>>> --- a/dlls/d3d10/effect.c >>>> +++ b/dlls/d3d10/effect.c >>>> @@ -526,6 +526,35 @@ static BOOL copy_name(const char *ptr, char **name) >>>> return TRUE; >>>> } >>>> >>>> +static struct d3d10_effect_variable * d3d10_effect_get_buffer_by_name(struct d3d10_effect *effect, >>>> + const char *name) >>>> +{ >>>> + ID3D10EffectVariable *v; >>>> + unsigned int i; >>>> + >>>> + for (i = 0; i < effect->local_buffer_count; ++i) >>>> + { >>>> + struct d3d10_effect_variable *l = &effect->local_buffers[i]; >>>> + if (l->name && !strcmp(l->name, name)) >>>> + { >>>> + TRACE("Found local buffer %s.\n", debugstr_a(name)); >>>> + return l; >>>> + } >>>> + } >>>> + >>>> + if (effect->pool) >>>> + { >>>> + if ((v = (ID3D10EffectVariable *)effect->pool->lpVtbl->GetConstantBufferByName(effect->pool, name)) >>>> + && v->lpVtbl->IsValid(v)) >>>> + { >>>> + TRACE("Found shared buffer %s.\n", debugstr_a(name)); >>>> + return impl_from_ID3D10EffectVariable(v); >>>> + } >>>> + } >>>> + >>>> + return NULL; >>>> +} >>>> + >>> I wonder if it would be nicer to just loop through the pool effect's >>> buffers instead, or at least call d3d10_effect_get_buffer_by_name() >>> directly. >> Yes, I have no problems with that. Making sure, do you mean storing >> "struct d3d10_effect*" for pool, instead of an interface pointer? > Probably, if it doesn't make other stuff more complicated (it shouldn't). > I guess you could check that native doesn't support "custom" pools > either, just to be sure that we won't ever need to go back on this. I could try testing that, but that can only get so far, because internal assumptions could be tricky to observe. For example, when you reference a buffer from a child effect, and update it, there is not API way to trigger d3d buffer update. Now that might go a "proper" way via some internal interface, but given that even QueryInterface is not really working, I'd be surprised they made such extra effort. Probably easiest way is to try custom pool interface, and see if any methods are called at all, expect for addref. If nothing gets called from top level object, that obviously means such change will be safe.

Sept. 30, 2021

Re: [PATCH 1/6] d3d10/effect: Go through both local and shared buffers when looking for shader resources.

by Matteo Bruni

On Thu, Sep 30, 2021 at 9:11 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > > > > On 9/30/21 10:03 PM, Matteo Bruni wrote: > > On Tue, Sep 28, 2021 at 2:23 PM Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > >> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > >> --- > >> dlls/d3d10/effect.c | 56 ++++++++++++++++++++++++--------------- > >> dlls/d3d10/tests/effect.c | 53 +++++++++++++++++++++++++----------- > >> 2 files changed, 72 insertions(+), 37 deletions(-) > >> > >> diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c > >> index 668efcda666..71660eb399e 100644 > >> --- a/dlls/d3d10/effect.c > >> +++ b/dlls/d3d10/effect.c > >> @@ -526,6 +526,35 @@ static BOOL copy_name(const char *ptr, char **name) > >> return TRUE; > >> } > >> > >> +static struct d3d10_effect_variable * d3d10_effect_get_buffer_by_name(struct d3d10_effect *effect, > >> + const char *name) > >> +{ > >> + ID3D10EffectVariable *v; > >> + unsigned int i; > >> + > >> + for (i = 0; i < effect->local_buffer_count; ++i) > >> + { > >> + struct d3d10_effect_variable *l = &effect->local_buffers[i]; > >> + if (l->name && !strcmp(l->name, name)) > >> + { > >> + TRACE("Found local buffer %s.\n", debugstr_a(name)); > >> + return l; > >> + } > >> + } > >> + > >> + if (effect->pool) > >> + { > >> + if ((v = (ID3D10EffectVariable *)effect->pool->lpVtbl->GetConstantBufferByName(effect->pool, name)) > >> + && v->lpVtbl->IsValid(v)) > >> + { > >> + TRACE("Found shared buffer %s.\n", debugstr_a(name)); > >> + return impl_from_ID3D10EffectVariable(v); > >> + } > >> + } > >> + > >> + return NULL; > >> +} > >> + > > I wonder if it would be nicer to just loop through the pool effect's > > buffers instead, or at least call d3d10_effect_get_buffer_by_name() > > directly. > Yes, I have no problems with that. Making sure, do you mean storing > "struct d3d10_effect*" for pool, instead of an interface pointer? Probably, if it doesn't make other stuff more complicated (it shouldn't). I guess you could check that native doesn't support "custom" pools either, just to be sure that we won't ever need to go back on this.

Sept. 30, 2021

Re: [PATCH 2/6] d3d10/effect: Go through both local and shared variables when looking for shader resources.

by Nikolay Sivov

On 9/30/21 10:03 PM, Matteo Bruni wrote: >> BlendState s_blendstate; >> -Texture s_texture; >> +Texture2D s_texture; >> PixelShader ps; > I'm curious if that change made any difference. > It has to match "shared" type I think. And I believe I had to change from "Texture", to get Load() call to compile. I have to admit, I don't understand what non-specific "Texture" type implies exactly. Does it mean I can use any texture type for it? > +float4 PS( float4 pos : SV_POSITION ) : SV_Target > +{ > + return s_texture.Load(int3(0,0,0)); > +} > + > +PixelShader vs = CompileShader(ps_4_0, PS()); > Of course it doesn't matter but I'd rather not use "vs" for a pixel > shader variable name... Eh, of course.

Sept. 30, 2021