November 2021 - Wine-commits

Jinoh Kang : winedbg: Refactor gdb_context::out_{buf*,len} into reply_buffer.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 9b29182ca7c39f3c3e965101a11dfccd0efd66f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b29182ca7c39f3c3e965101… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 24 00:09:48 2021 +0900 winedbg: Refactor gdb_context::out_{buf*,len} into reply_buffer. This is required for a subsequent patch that adds buffering for GDB qXfer reply data. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/gdbproxy.c | 134 ++++++++++++++++++++++++++------------------ 1 file changed, 80 insertions(+), 54 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index c1d0bda1a41..07a45cd1b15 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -54,6 +54,13 @@ struct gdb_xpoint unsigned int value; }; +struct reply_buffer +{ + unsigned char* base; + size_t len; + size_t alloc; +}; + struct gdb_context { /* gdb information */ @@ -66,9 +73,7 @@ struct gdb_context char* in_packet; int in_packet_len; /* outgoing buffer */ - char* out_buf; - int out_buf_alloc; - int out_len; + struct reply_buffer out_buf; int out_curr_packet; /* generic GDB thread information */ int exec_tid; /* tid used in step & continue */ @@ -224,12 +229,57 @@ static void hex_to(char* dst, const void* src, size_t len) } } -static unsigned char checksum(const char* ptr, int len) +static void reply_buffer_clear(struct reply_buffer* reply) +{ + reply->len = 0; +} + +static void reply_buffer_grow(struct reply_buffer* reply, size_t size) +{ + if (reply->alloc < reply->len + size) + { + reply->alloc = ((reply->len + size) / 32 + 1) * 32; + reply->base = realloc(reply->base, reply->alloc); + } +} + +static void reply_buffer_append(struct reply_buffer* reply, const void* data, size_t size) +{ + reply_buffer_grow(reply, size); + memcpy(reply->base + reply->len, data, size); + reply->len += size; +} + +static inline void reply_buffer_append_hex(struct reply_buffer* reply, const void* src, size_t len) +{ + reply_buffer_grow(reply, len * 2); + hex_to((char *)reply->base + reply->len, src, len); + reply->len += len * 2; +} + +static inline void reply_buffer_append_uinthex(struct reply_buffer* reply, ULONG_PTR val, int len) +{ + char buf[sizeof(ULONG_PTR) * 2], *ptr; + + assert(len <= sizeof(ULONG_PTR)); + + ptr = buf + len * 2; + while (ptr != buf) + { + *--ptr = hex_to0(val & 0x0F); + val >>= 4; + } + + reply_buffer_append(reply, ptr, len * 2); +} + +static unsigned char checksum(const void* data, int len) { unsigned cksum = 0; + const unsigned char* ptr = data; while (len-- > 0) - cksum += (unsigned char)*ptr++; + cksum += *ptr++; return cksum; } @@ -705,20 +755,9 @@ static int addr_width(struct gdb_context* gdbctx) enum packet_return {packet_error = 0x00, packet_ok = 0x01, packet_done = 0x02, packet_last_f = 0x80}; -static void packet_reply_grow(struct gdb_context* gdbctx, size_t size) -{ - if (gdbctx->out_buf_alloc < gdbctx->out_len + size) - { - gdbctx->out_buf_alloc = ((gdbctx->out_len + size) / 32 + 1) * 32; - gdbctx->out_buf = realloc(gdbctx->out_buf, gdbctx->out_buf_alloc); - } -} - static void packet_reply_hex_to(struct gdb_context* gdbctx, const void* src, int len) { - packet_reply_grow(gdbctx, len * 2); - hex_to(&gdbctx->out_buf[gdbctx->out_len], src, len); - gdbctx->out_len += len * 2; + reply_buffer_append_hex(&gdbctx->out_buf, src, len); } static inline void packet_reply_hex_to_str(struct gdb_context* gdbctx, const char* src) @@ -728,15 +767,7 @@ static inline void packet_reply_hex_to_str(struct gdb_context* gdbctx, const cha static void packet_reply_val(struct gdb_context* gdbctx, ULONG_PTR val, int len) { - int i, shift; - - shift = (len - 1) * 8; - packet_reply_grow(gdbctx, len * 2); - for (i = 0; i < len; i++, shift -= 8) - { - gdbctx->out_buf[gdbctx->out_len++] = hex_to0((val >> (shift + 4)) & 0x0F); - gdbctx->out_buf[gdbctx->out_len++] = hex_to0((val >> shift ) & 0x0F); - } + reply_buffer_append_uinthex(&gdbctx->out_buf, val, len); } static const unsigned char gdb_special_chars_lookup_table[4] = { @@ -764,6 +795,7 @@ static inline BOOL is_gdb_special_char(unsigned char val) static void packet_reply_add(struct gdb_context* gdbctx, const char* str) { const unsigned char *ptr = (unsigned char *)str, *curr; + unsigned char esc_seq[2]; while (*ptr) { @@ -772,23 +804,20 @@ static void packet_reply_add(struct gdb_context* gdbctx, const char* str) while (*ptr && !is_gdb_special_char(*ptr)) ptr++; - packet_reply_grow(gdbctx, ptr - curr); - memcpy(&gdbctx->out_buf[gdbctx->out_len], curr, ptr - curr); - gdbctx->out_len += ptr - curr; + reply_buffer_append(&gdbctx->out_buf, curr, ptr - curr); if (!*ptr) break; - packet_reply_grow(gdbctx, 2); - gdbctx->out_buf[gdbctx->out_len++] = 0x7D; - gdbctx->out_buf[gdbctx->out_len++] = 0x20 ^ *ptr++; + esc_seq[0] = 0x7D; + esc_seq[1] = 0x20 ^ *ptr++; + reply_buffer_append(&gdbctx->out_buf, esc_seq, 2); } } static void packet_reply_open(struct gdb_context* gdbctx) { assert(gdbctx->out_curr_packet == -1); - packet_reply_grow(gdbctx, 1); - gdbctx->out_buf[gdbctx->out_len++] = '$'; - gdbctx->out_curr_packet = gdbctx->out_len; + reply_buffer_append(&gdbctx->out_buf, "$", 1); + gdbctx->out_curr_packet = gdbctx->out_buf.len; } static void packet_reply_close(struct gdb_context* gdbctx) @@ -796,10 +825,9 @@ static void packet_reply_close(struct gdb_context* gdbctx) unsigned char cksum; int plen; - plen = gdbctx->out_len - gdbctx->out_curr_packet; - packet_reply_grow(gdbctx, 1); - gdbctx->out_buf[gdbctx->out_len++] = '#'; - cksum = checksum(&gdbctx->out_buf[gdbctx->out_curr_packet], plen); + plen = gdbctx->out_buf.len - gdbctx->out_curr_packet; + reply_buffer_append(&gdbctx->out_buf, "#", 1); + cksum = checksum(gdbctx->out_buf.base + gdbctx->out_curr_packet, plen); packet_reply_hex_to(gdbctx, &cksum, 1); gdbctx->out_curr_packet = -1; } @@ -815,20 +843,20 @@ static void packet_reply_close_xfer(struct gdb_context* gdbctx, unsigned int off int begin = gdbctx->out_curr_packet + 1; int plen; - if (begin + off < gdbctx->out_len) + if (begin + off < gdbctx->out_buf.len) { - gdbctx->out_len -= off; - memmove(gdbctx->out_buf + begin, gdbctx->out_buf + begin + off, gdbctx->out_len); + gdbctx->out_buf.len -= off; + memmove(gdbctx->out_buf.base + begin, gdbctx->out_buf.base + begin + off, gdbctx->out_buf.len); } else { - gdbctx->out_buf[gdbctx->out_curr_packet] = 'l'; - gdbctx->out_len = gdbctx->out_curr_packet + 1; + gdbctx->out_buf.base[gdbctx->out_curr_packet] = 'l'; + gdbctx->out_buf.len = gdbctx->out_curr_packet + 1; } - plen = gdbctx->out_len - begin; - if (plen > len) gdbctx->out_len -= (plen - len); - else gdbctx->out_buf[gdbctx->out_curr_packet] = 'l'; + plen = gdbctx->out_buf.len - begin; + if (plen > len) gdbctx->out_buf.len -= (plen - len); + else gdbctx->out_buf.base[gdbctx->out_curr_packet] = 'l'; packet_reply_close(gdbctx); } @@ -2098,10 +2126,10 @@ static BOOL extract_packets(struct gdb_context* gdbctx) case packet_done: break; } - TRACE("Reply: %s\n", debugstr_an(gdbctx->out_buf, gdbctx->out_len)); - i = send(gdbctx->sock, gdbctx->out_buf, gdbctx->out_len, 0); - assert(i == gdbctx->out_len); - gdbctx->out_len = 0; + TRACE("Reply: %s\n", debugstr_an((char *)gdbctx->out_buf.base, gdbctx->out_buf.len)); + i = send(gdbctx->sock, (char *)gdbctx->out_buf.base, gdbctx->out_buf.len, 0); + assert(i == gdbctx->out_buf.len); + reply_buffer_clear(&gdbctx->out_buf); } else WARN("Ignoring: %s (checksum: %d != %d)\n", debugstr_an(ptr, sum - ptr), @@ -2255,9 +2283,7 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne gdbctx->in_buf = NULL; gdbctx->in_buf_alloc = 0; gdbctx->in_len = 0; - gdbctx->out_buf = NULL; - gdbctx->out_buf_alloc = 0; - gdbctx->out_len = 0; + memset(&gdbctx->out_buf, 0, sizeof(gdbctx->out_buf)); gdbctx->out_curr_packet = -1; gdbctx->exec_tid = -1;

1 0

Hugh McMaster : conhost: Only use the maximum character width if a double-byte character set is in use.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 996126b2deccaad8c61f5d72d9c322fb7fb56a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=996126b2deccaad8c61f5d72… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Nov 23 22:14:08 2021 +1100 conhost: Only use the maximum character width if a double-byte character set is in use. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 319463537d5..7ad0d48effd 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -646,7 +646,7 @@ static HFONT select_font_config( struct console_config *config, unsigned int cp, lstrcpyW( config->face_name, lf->lfFaceName ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( cp, &cpinfo ) && cpinfo.MaxCharSize == 2) config->cell_width = tm.tmMaxCharWidth; return font; @@ -713,7 +713,7 @@ static BOOL set_console_font( struct console *console, const LOGFONTW *logfont ) memcpy( font_info->face_name, logfont->lfFaceName, font_info->face_len * sizeof(WCHAR) ); /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ - if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize > 1) + if (GetCPInfo( console->output_cp, &cpinfo ) && cpinfo.MaxCharSize == 2) font_info->width = tm.tmMaxCharWidth; if (console->window->font) DeleteObject( console->window->font );

1 0

Nikolay Sivov : dxva2: Introduce progressive processor device.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 12a1b4b360abc6db5de2e393b9ec53a77f532ffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=12a1b4b360abc6db5de2e393… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 23 15:21:45 2021 +0300 dxva2: Introduce progressive processor device. The point is to provide a device, with similar caps and NV12 support, while keeping software device on its own, the way it should be. This is based on research by Derek Lesho. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 126 ++++++++++++++++++++++++++++++++------- dlls/dxva2/tests/dxva2.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/mixer.c | 2 + 3 files changed, 257 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12a1b4b360abc6db5de2…

1 0

Nikolay Sivov : d3d10/effect: Fix freed register table pointer (Coverity).
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 2fd283e968bfd75424279387ae479a7bfaafcd5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fd283e968bfd75424279387… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 21 19:45:16 2021 +0300 d3d10/effect: Fix freed register table pointer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 04250a1663e..b9992f84a8b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -305,7 +305,7 @@ static void d3d10_effect_preshader_clear(struct d3d10_effect_preshader *p) unsigned int i; for (i = 0; i < ARRAY_SIZE(p->reg_tables); ++i) - heap_free(&p->reg_tables[i].f); + heap_free(p->reg_tables[i].f); if (p->code) ID3D10Blob_Release(p->code); heap_free(p->vars);

1 0

Zebediah Figura : wined3d: Respect the BO address offset when flipping the framebuffer in software.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: f059a25af11947b9bd53e3f32efda8d7873f8126 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f059a25af11947b9bd53e3f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 22 18:14:41 2021 -0600 wined3d: Respect the BO address offset when flipping the framebuffer in software. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 79dc0bd06b6..9c6f5e18c28 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -419,8 +419,8 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i unsigned int restore_idx; BYTE *row, *top, *bottom; BOOL src_is_upside_down; + BYTE *mem = NULL; unsigned int i; - BYTE *mem; wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); @@ -504,8 +504,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i mem = GL_EXTCALL(glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_WRITE)); checkGLcall("glMapBuffer"); } - else - mem = data.addr; + mem += (uintptr_t)data.addr; top = mem; bottom = mem + row_pitch * (height - 1);

1 0

Zebediah Figura : wined3d: Allow OpenGL pixel pack buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: d7ba2085697b41c00e94701569074c6c03e30a14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ba2085697b41c00e947015… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 22 18:14:42 2021 -0600 wined3d: Allow OpenGL pixel pack buffer objects to be suballocated from a larger buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 +++++-- dlls/wined3d/texture.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9c6f5e18c28..060ac84b8b7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -420,9 +420,11 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i BYTE *row, *top, *bottom; BOOL src_is_upside_down; BYTE *mem = NULL; + uint8_t *offset; unsigned int i; wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); + offset = data.addr; restore_texture = context->current_rt.texture; restore_idx = context->current_rt.sub_resource_idx; @@ -471,6 +473,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, wined3d_bo_gl(data.buffer_object)->id)); checkGLcall("glBindBuffer"); + offset += data.buffer_object->buffer_offset; } level = sub_resource_idx % texture->level_count; @@ -484,7 +487,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i width = wined3d_texture_get_level_width(texture, level); height = wined3d_texture_get_level_height(texture, level); gl_info->gl_ops.gl.p_glReadPixels(0, 0, width, height, - format_gl->format, format_gl->type, data.addr); + format_gl->format, format_gl->type, offset); checkGLcall("glReadPixels"); /* Reset previous pixel store pack state */ @@ -504,7 +507,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i mem = GL_EXTCALL(glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_WRITE)); checkGLcall("glMapBuffer"); } - mem += (uintptr_t)data.addr; + mem += (uintptr_t)offset; top = mem; bottom = mem + row_pitch * (height - 1); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 072092e73be..1ab50a27596 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2693,7 +2693,7 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, bo->id)); checkGLcall("glBindBuffer"); - mem = data->addr; + mem = (uint8_t *)data->addr + bo->b.buffer_offset; } else { @@ -2796,7 +2796,8 @@ static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, bo->id)); checkGLcall("glBindBuffer"); - GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, (GLintptr)data->addr, sub_resource->size, src_data)); + GL_EXTCALL(glBufferSubData(GL_PIXEL_PACK_BUFFER, + (GLintptr)data->addr + bo->b.buffer_offset, sub_resource->size, src_data)); checkGLcall("glBufferSubData"); } else @@ -2827,6 +2828,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, unsigned int src_level, src_width, src_height, src_depth; unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_format_gl *format_gl; + uint8_t *offset = dst_bo_addr->addr; struct wined3d_bo *dst_bo; BOOL srgb = FALSE; GLenum target; @@ -2906,22 +2908,23 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, wined3d_bo_gl(dst_bo)->id)); checkGLcall("glBindBuffer"); + offset += dst_bo->buffer_offset; } if (src_texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); + src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, offset); - GL_EXTCALL(glGetCompressedTexImage(target, src_level, dst_bo_addr->addr)); + GL_EXTCALL(glGetCompressedTexImage(target, src_level, offset)); checkGLcall("glGetCompressedTexImage"); } else { TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); + src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, offset); - gl_info->gl_ops.gl.p_glGetTexImage(target, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); + gl_info->gl_ops.gl.p_glGetTexImage(target, src_level, format_gl->format, format_gl->type, offset); checkGLcall("glGetTexImage"); }

1 0

Henri Verbeet : wined3d: Respect the BO buffer offset in create_buffer_texture().
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 0b9002de9672d8d05f078537b7daf55097e08c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b9002de9672d8d05f078537… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 22 18:14:43 2021 -0600 wined3d: Respect the BO buffer offset in create_buffer_texture(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index b981602f1a2..0ea14531766 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -257,6 +257,10 @@ static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_c return; } + wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); + bo_gl = wined3d_bo_gl(buffer->buffer_object); + offset += bo_gl->b.buffer_offset; + if ((offset & (gl_info->limits.texture_buffer_offset_alignment - 1))) { FIXME("Buffer offset %u is not %u byte aligned.\n", @@ -264,9 +268,6 @@ static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_c return; } - wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); - bo_gl = wined3d_bo_gl(buffer->buffer_object); - view->target = GL_TEXTURE_BUFFER; if (!view->name) gl_info->gl_ops.gl.p_glGenTextures(1, &view->name);

1 0

Henri Verbeet : wined3d: Respect the BO buffer offset in wined3d_unordered_access_view_gl_clear().
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 7816809395c1235a215d1faeb1d3a66a4f9504ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=7816809395c1235a215d1fae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 22 18:14:44 2021 -0600 wined3d: Respect the BO buffer offset in wined3d_unordered_access_view_gl_clear(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0ea14531766..5905a4bcfb5 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1598,7 +1598,7 @@ void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view get_buffer_view_range(buffer, &view_gl->v.desc, &format_gl->f, &offset, &size); wined3d_context_gl_bind_bo(context_gl, bo_gl->binding, bo_gl->id); GL_EXTCALL(glClearBufferSubData(bo_gl->binding, format_gl->internal, - offset, size, format_gl->format, format_gl->type, clear_value)); + bo_gl->b.buffer_offset + offset, size, format_gl->format, format_gl->type, clear_value)); wined3d_context_gl_reference_bo(context_gl, bo_gl); checkGLcall("clear unordered access view"); }

1 0

Henri Verbeet : wined3d: Respect the BO buffer offset in wined3d_buffer_gl_upload_ranges().
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: 2961640bcb4161cff6731e22b95170e52ce5e670 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2961640bcb4161cff6731e22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 22 18:14:45 2021 -0600 wined3d: Respect the BO buffer offset in wined3d_buffer_gl_upload_ranges(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d3aeb2e76f4..cd277433c91 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1387,8 +1387,8 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(bo_gl->binding, - range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + GL_EXTCALL(glBufferSubData(bo_gl->binding, bo_gl->b.buffer_offset + range->offset, + range->size, (BYTE *)data + range->offset - data_offset)); } wined3d_context_gl_reference_bo(context_gl, bo_gl); checkGLcall("buffer upload");

1 0

Zebediah Figura : wined3d: Respect the BO buffer offset in wined3d_buffer_gl_download_ranges().
by Alexandre Julliard 23 Nov '21

23 Nov '21

Module: wine Branch: master Commit: d4c3bf9d795b4c92d4d69b035142863eda6856f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4c3bf9d795b4c92d4d69b03… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 22 18:14:46 2021 -0600 wined3d: Respect the BO buffer offset in wined3d_buffer_gl_download_ranges(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cd277433c91..e5bc4c92e6b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1412,8 +1412,8 @@ static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, str while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glGetBufferSubData(bo_gl->binding, - range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + GL_EXTCALL(glGetBufferSubData(bo_gl->binding, bo_gl->b.buffer_offset + range->offset, + range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("buffer download"); }

1 0