[PATCH v2 1/6] wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding in wined3d_texture_gl_allocate_mutable_storage().
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/texture.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4c7082912b..f0ef42065d3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -930,6 +930,9 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g else layer_count = texture_gl->t.layer_count; + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + for (layer = 0; layer < layer_count; ++layer) { target = wined3d_texture_gl_get_sub_resource_target(texture_gl, layer * level_count); -- 2.32.0
Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e51402f1cf..327e73796c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12956,6 +12956,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + if (palette) { gl_info->gl_ops.gl.p_glTexImage1D(GL_TEXTURE_1D, 0, GL_RGB, 256, 0, GL_BGRA, -- 2.32.0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0b0d594b4b1..675c26ac6fe 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2716,8 +2716,8 @@ map: } else { - map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); - map_ptr += offset; + if ((map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))))) + map_ptr += offset; } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); -- 2.32.0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 675c26ac6fe..700ccace2e5 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2712,7 +2712,8 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, offset, size, wined3d_resource_gl_map_flags(bo, flags))); + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))))) + map_ptr += offset; } else { @@ -2757,11 +2758,12 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { + /* The offset passed to glFlushMappedBufferRange() is relative to the + * mapped range, but we map the whole buffer anyway. */ for (i = 0; i < range_count; ++i) { - /* The offset passed to glFlushMappedBufferRange() is relative to - * the mapped range, so don't add data->addr in this case. */ - GL_EXTCALL(glFlushMappedBufferRange(bo->binding, ranges[i].offset, ranges[i].size)); + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, + bo->b.buffer_offset + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); } } else if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) -- 2.32.0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 700ccace2e5..0c8ee0f605b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2669,8 +2669,7 @@ void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_ wined3d_context_gl_poll_fences(context_gl); } -static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, - struct wined3d_context_gl *context_gl, size_t offset, size_t size, uint32_t flags) +static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_gl *context_gl, uint32_t flags) { struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); const struct wined3d_gl_info *gl_info; @@ -2712,13 +2711,11 @@ map: if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))))) - map_ptr += offset; + map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } else { - if ((map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))))) - map_ptr += offset; + map_ptr = GL_EXTCALL(glMapBuffer(bo->binding, wined3d_resource_gl_legacy_map_flags(flags))); } wined3d_context_gl_bind_bo(context_gl, bo->binding, 0); @@ -2736,10 +2733,13 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, if (!(bo = data->buffer_object)) return data->addr; - if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, (uintptr_t)data->addr, size, flags))) + if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, flags))) + { ERR("Failed to map bo.\n"); + return NULL; + } - return map_ptr; + return (uint8_t *)map_ptr + (uintptr_t)data->addr; } static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct wined3d_const_bo_address *data, -- 2.32.0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 0c8ee0f605b..f02a0f400a6 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2739,7 +2739,7 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, return NULL; } - return (uint8_t *)map_ptr + (uintptr_t)data->addr; + return (uint8_t *)map_ptr + bo->buffer_offset + (uintptr_t)data->addr; } static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct wined3d_const_bo_address *data, @@ -2771,7 +2771,7 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct for (i = 0; i < range_count; ++i) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, - (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); + bo->b.buffer_offset + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } } -- 2.32.0
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
participants (2)
-
Henri Verbeet -
Zebediah Figura