October 2018 - Wine-devel - list.winehq.org

[PATCH] ws2_32/tests: Add test for completion notification flags.
by Jacek Caban 26 Oct '18

26 Oct '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)

2 1

[PATCH vkd3d 5/5] vkd3d: Accept 0xffffffff as cube count for SRVs.
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 4 +++- tests/d3d12.c | 18 +++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index cb1427f94a4a..f857de2dcf0d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1667,7 +1667,9 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; - vkd3d_desc.layer_count = 6 * desc->u.TextureCubeArray.NumCubes; + vkd3d_desc.layer_count = desc->u.TextureCubeArray.NumCubes; + if (vkd3d_desc.layer_count != VK_REMAINING_ARRAY_LAYERS) + vkd3d_desc.layer_count *= 6; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); break; diff --git a/tests/d3d12.c b/tests/d3d12.c index 49e7a788ef02..25c2fdf80439 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10845,16 +10845,20 @@ static void test_cube_maps(void) const D3D12_SHADER_BYTECODE *ps; unsigned int miplevel_count; unsigned int array_size; + unsigned int cube_count; } ps_tests[] = { - {&ps_cube, 1, 6}, - {&ps_cube, 2, 6}, - {&ps_cube, 3, 6}, + {&ps_cube, 1, 6, 1}, + {&ps_cube, 2, 6, 1}, + {&ps_cube, 3, 6, 1}, + {&ps_cube, 3, 6, ~0u}, - {&ps_cube_array, 1, 12}, - {&ps_cube_array, 2, 12}, - {&ps_cube_array, 3, 12}, + {&ps_cube_array, 1, 12, 2}, + {&ps_cube_array, 1, 12, ~0u}, + {&ps_cube_array, 2, 12, 2}, + {&ps_cube_array, 3, 12, 2}, + {&ps_cube_array, 3, 12, ~0u}, }; memset(&desc, 0, sizeof(desc)); @@ -10913,7 +10917,7 @@ static void test_cube_maps(void) srv_desc.TextureCubeArray.MostDetailedMip = 0; srv_desc.TextureCubeArray.MipLevels = test->miplevel_count; srv_desc.TextureCubeArray.First2DArrayFace = 0; - srv_desc.TextureCubeArray.NumCubes = test->array_size / 6; + srv_desc.TextureCubeArray.NumCubes = test->cube_count; srv_desc.TextureCubeArray.ResourceMinLODClamp = 0.0f; } ID3D12Device_CreateShaderResourceView(context.device, texture, &srv_desc, cpu_handle); -- 2.18.1

2 1

[PATCH vkd3d 3/5] vkd3d-shader: Propagate errors from vkd3d_dxbc_compiler_emit_control_flow_instruction().
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 3 +- libs/vkd3d-shader/spirv.c | 35 +++++++++++++++--------- libs/vkd3d-shader/vkd3d_shader_main.c | 7 +++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index ac163583b65a..b9472a2432e5 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -34,7 +34,8 @@ enum vkd3d_result VKD3D_ERROR = -1, /* unspecified failure */ VKD3D_ERROR_OUT_OF_MEMORY = -2, VKD3D_ERROR_INVALID_ARGUMENT = -3, - VKD3D_ERROR_NOT_IMPLEMENTED = -4, + VKD3D_ERROR_INVALID_SHADER = -4, + VKD3D_ERROR_NOT_IMPLEMENTED = -5, VKD3D_FORCE_32_BIT_ENUM(VKD3D_RESULT), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f2ed8b888dbf..13631a07fd1b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5079,7 +5079,7 @@ static struct vkd3d_control_flow_info *vkd3d_dxbc_compiler_find_innermost_breaka return NULL; } -static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_compiler *compiler, +static int vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { uint32_t loop_header_block_id, loop_body_block_id, continue_block_id; @@ -5095,7 +5095,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { case VKD3DSIH_IF: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, VKD3DSP_WRITEMASK_0); condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, instruction->flags, 1, val_id); @@ -5149,7 +5149,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ case VKD3DSIH_LOOP: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; loop_header_block_id = vkd3d_spirv_alloc_id(builder); loop_body_block_id = vkd3d_spirv_alloc_id(builder); @@ -5190,7 +5190,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ case VKD3DSIH_SWITCH: if (!(cf_info = vkd3d_dxbc_compiler_push_control_flow_level(compiler))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; merge_block_id = vkd3d_spirv_alloc_id(builder); @@ -5206,8 +5206,6 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ cf_info->u.switch_.case_blocks = NULL; cf_info->u.switch_.case_blocks_size = 0; cf_info->u.switch_.case_block_count = 0; - vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, - 10, sizeof(*cf_info->u.switch_.case_blocks)); cf_info->u.switch_.default_block_id = 0; cf_info->inside_block = false; cf_info->current_block = VKD3D_BLOCK_SWITCH; @@ -5215,6 +5213,11 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ vkd3d_spirv_build_op_name(builder, merge_block_id, "switch%u_merge", compiler->switch_id); ++compiler->switch_id; + + if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, + 10, sizeof(*cf_info->u.switch_.case_blocks))) + return VKD3D_ERROR_OUT_OF_MEMORY; + break; case VKD3DSIH_ENDSWITCH: @@ -5252,7 +5255,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!vkd3d_array_reserve((void **)&cf_info->u.switch_.case_blocks, &cf_info->u.switch_.case_blocks_size, 2 * (cf_info->u.switch_.case_block_count + 1), sizeof(*cf_info->u.switch_.case_blocks))) - return; + return VKD3D_ERROR_OUT_OF_MEMORY; label_id = vkd3d_spirv_alloc_id(builder); if (cf_info->inside_block) /* fall-through */ @@ -5292,7 +5295,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(breakable_cf_info = vkd3d_dxbc_compiler_find_innermost_breakable_cf_construct(compiler))) { FIXME("Unhandled break instruction.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } if (breakable_cf_info->current_block == VKD3D_BLOCK_LOOP) @@ -5318,7 +5321,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'breakc' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } merge_block_id = vkd3d_dxbc_compiler_emit_conditional_branch(compiler, @@ -5336,7 +5339,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continue' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } vkd3d_spirv_build_op_branch(builder, loop_cf_info->u.loop.continue_block_id); @@ -5352,7 +5355,7 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continuec' instruction outside loop.\n"); - return; + return VKD3D_ERROR_INVALID_SHADER; } merge_block_id = vkd3d_dxbc_compiler_emit_conditional_branch(compiler, @@ -5380,6 +5383,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ ERR("Unexpected instruction %#x.\n", instruction->handler_idx); break; } + + return VKD3D_OK; } static void vkd3d_dxbc_compiler_emit_deriv_instruction(struct vkd3d_dxbc_compiler *compiler, @@ -6474,9 +6479,11 @@ static bool is_dcl_instruction(enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx return VKD3DSIH_DCL <= handler_idx && handler_idx <= VKD3DSIH_DCL_VERTICES_OUT; } -void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, +int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + int ret = VKD3D_OK; + if (!is_dcl_instruction(instruction->handler_idx) && !compiler->after_declarations_section) { compiler->after_declarations_section = true; @@ -6681,7 +6688,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_RETP: case VKD3DSIH_SWITCH: case VKD3DSIH_TEXKILL: - vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction); + ret = vkd3d_dxbc_compiler_emit_control_flow_instruction(compiler, instruction); break; case VKD3DSIH_DSX: case VKD3DSIH_DSX_COARSE: @@ -6774,6 +6781,8 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler default: FIXME("Unhandled instruction %#x.\n", instruction->handler_idx); } + + return ret; } static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 348fa5d6e7c6..71410f1d10cb 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -120,10 +120,13 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, return VKD3D_ERROR_INVALID_ARGUMENT; } - vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction); + if ((ret = vkd3d_dxbc_compiler_handle_instruction(spirv_compiler, &instruction)) < 0) + break; } - ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + if (ret >= 0) + ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, spirv); + vkd3d_dxbc_compiler_destroy(spirv_compiler); vkd3d_shader_parser_destroy(&parser); return ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index a2747acd09b2..1d79c91602b8 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -809,7 +809,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; -void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, +int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; -- 2.18.1

2 1

[PATCH vkd3d 1/5] tests: Annotate another fall-through switch case (Coverity).
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b9e4a7004837..49e7a788ef02 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -15457,6 +15457,7 @@ static void test_uav_load(void) { default: trace("Unhandled format %#x.\n", test->uav_desc.Format); + /* fall-through */ case DXGI_FORMAT_R32_FLOAT: cpu_handle = rtv_float; break; -- 2.18.1

2 1

[PATCH vkd3d 2/5] vkd3d-shader: Add asserts() to vkd3d_dxbc_compiler_emit_control_flow_instruction().
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f6e5746084e1..f2ed8b888dbf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5287,6 +5287,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *breakable_cf_info; + assert(compiler->control_flow_depth); + if (!(breakable_cf_info = vkd3d_dxbc_compiler_find_innermost_breakable_cf_construct(compiler))) { FIXME("Unhandled break instruction.\n"); @@ -5311,6 +5313,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *loop_cf_info; + assert(compiler->control_flow_depth); + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'breakc' instruction outside loop.\n"); @@ -5327,6 +5331,8 @@ static void vkd3d_dxbc_compiler_emit_control_flow_instruction(struct vkd3d_dxbc_ { struct vkd3d_control_flow_info *loop_cf_info; + assert(compiler->control_flow_depth); + if (!(loop_cf_info = vkd3d_dxbc_compiler_find_innermost_loop(compiler))) { ERR("Invalid 'continue' instruction outside loop.\n"); -- 2.18.1

2 1

[PATCH vkd3d 4/5] build: Check VK_HEADER_VERSION.
by Józef Kucia 26 Oct '18

26 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 3 +++ m4/vulkan.m4 | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 m4/vulkan.m4 diff --git a/configure.ac b/configure.ac index 58672c510ab9..618b8c098876 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,9 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION +AS_IF([test "$vkd3d_cv_vk_header_version" -lt 84], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.84 is required.])]) + dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/m4/vulkan.m4 b/m4/vulkan.m4 new file mode 100644 index 000000000000..088be7d5faae --- /dev/null +++ b/m4/vulkan.m4 @@ -0,0 +1,19 @@ +dnl VKD3D_CHECK_VULKAN_HEADER_VERSION +AC_DEFUN([VKD3D_CHECK_VULKAN_HEADER_VERSION], + +[AS_VAR_PUSHDEF([vkd3d_vk_version], vkd3d_cv_vk_header_version) +AC_CACHE_CHECK([VK_HEADER_VERSION], vkd3d_vk_version, + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([#include <stdio.h> + #include <vulkan/vulkan.h> + int main(void) + { + FILE *f = fopen("conftest.out", "wb"); + if (!f) return 1; + fprintf(f, "%u", VK_HEADER_VERSION); + fclose(f); + return 0; + }])], + [AS_VAR_SET([vkd3d_vk_version], [`cat conftest.out`])], + [AS_VAR_SET([vkd3d_vk_version], [0])])]) +AS_VAR_POPDEF([vkd3d_vk_version])]) -- 2.18.1

2 2

[PATCH 5/5] wined3d: Move the "buffer_object_usage" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1481e9bc6f6..17bcb70bc34 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -257,7 +257,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - buffer_gl->b.buffer_object_usage = gl_usage; + buffer_gl->buffer_object_usage = gl_usage; buffer_invalidate_bo_range(&buffer_gl->b, 0, 0); return TRUE; @@ -827,7 +827,7 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, if (flags & WINED3D_MAP_DISCARD) { GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, - NULL, buffer_gl->b.buffer_object_usage)); + NULL, buffer_gl->buffer_object_usage)); checkGLcall("glBufferData"); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 226fdd0d3f5..2b52218972f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3759,7 +3759,6 @@ struct wined3d_buffer struct wined3d_buffer_desc desc; GLuint buffer_object; - GLenum buffer_object_usage; unsigned int bind_flags; DWORD flags; DWORD locations; @@ -3799,6 +3798,7 @@ struct wined3d_buffer_gl { struct wined3d_buffer b; + GLenum buffer_object_usage; GLenum buffer_type_hint; }; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the "buffer_type_hint" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 203 +++++++++++++++++++++-------------------- dlls/wined3d/view.c | 14 +-- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 115 insertions(+), 105 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 4b66193746f..1481e9bc6f6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -133,9 +133,9 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc } /* Context activation is done by the caller. */ -static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *context) +static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { - context_bind_bo(context, buffer->buffer_type_hint, buffer->buffer_object); + context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); } /* Context activation is done by the caller. */ @@ -194,14 +194,14 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct w } /* Context activation is done by the caller. */ -static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wined3d_context *context) +static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; - TRACE("Creating an OpenGL buffer object for wined3d_buffer %p with usage %s.\n", - buffer, debug_d3dusage(buffer->resource.usage)); + TRACE("Creating an OpenGL buffer object for wined3d buffer %p with usage %s.\n", + buffer_gl, debug_d3dusage(buffer_gl->b.resource.usage)); /* Make sure that the gl error is cleared. Do not use checkGLcall * here because checkGLcall just prints a fixme and continues. However, @@ -216,15 +216,15 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi * to be verified to check if the rhw and color values are in the correct * format. */ - GL_EXTCALL(glGenBuffers(1, &buffer->buffer_object)); + GL_EXTCALL(glGenBuffers(1, &buffer_gl->b.buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); - if (!buffer->buffer_object || error != GL_NO_ERROR) + if (!buffer_gl->b.buffer_object || error != GL_NO_ERROR) { ERR("Failed to create a BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; } - buffer_bind(buffer, context); + wined3d_buffer_gl_bind(buffer_gl, context); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -232,22 +232,24 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi goto fail; } - if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) { TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); gl_usage = GL_STREAM_DRAW_ARB; if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { - GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); - GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, + GL_BUFFER_FLUSHING_UNMAP_APPLE, GL_FALSE)); + GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, + GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); checkGLcall("glBufferParameteriAPPLE"); - buffer->flags |= WINED3D_BUFFER_APPLESYNC; + buffer_gl->b.flags |= WINED3D_BUFFER_APPLESYNC; } /* No setup is needed here for GL_ARB_map_buffer_range. */ } - GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, NULL, gl_usage)); + GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, NULL, gl_usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -255,17 +257,17 @@ static BOOL buffer_create_buffer_object(struct wined3d_buffer *buffer, struct wi goto fail; } - buffer->buffer_object_usage = gl_usage; - buffer_invalidate_bo_range(buffer, 0, 0); + buffer_gl->b.buffer_object_usage = gl_usage; + buffer_invalidate_bo_range(&buffer_gl->b, 0, 0); return TRUE; fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_destroy_buffer_object(buffer, context); - buffer_clear_dirty_areas(buffer); + buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; + buffer_destroy_buffer_object(&buffer_gl->b, context); + buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -532,18 +534,18 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) } /* Context activation is done by the caller. */ -static void wined3d_buffer_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, +static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_map_range *range; - buffer_bind(buffer, context); + wined3d_buffer_gl_bind(buffer_gl, context); while (range_count--) { range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, + GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, range->offset, range->size, (BYTE *)data + range->offset - data_offset)); } checkGLcall("glBufferSubData"); @@ -600,7 +602,8 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - wined3d_buffer_upload_ranges(buffer, context, data, 0, buffer->modified_areas, buffer->maps); + wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), + context, data, 0, buffer->modified_areas, buffer->maps); heap_free(data); } @@ -627,7 +630,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, WARN("Trying to create BO for buffer %p with no WINED3D_BUFFER_USE_BO.\n", buffer); return FALSE; } - return buffer_create_buffer_object(buffer, context); + return wined3d_buffer_gl_create_buffer_object(wined3d_buffer_gl(buffer), context); default: ERR("Invalid location %s.\n", wined3d_debug_location(location)); @@ -638,6 +641,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("buffer %p, context %p, location %s.\n", @@ -672,15 +676,15 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - buffer_bind(buffer, context); - GL_EXTCALL(glGetBufferSubData(buffer->buffer_type_hint, 0, buffer->resource.size, + wined3d_buffer_gl_bind(buffer_gl, context); + GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, buffer->resource.heap_memory)); checkGLcall("buffer download"); break; case WINED3D_LOCATION_BUFFER: if (!buffer->conversion_map) - wined3d_buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, + wined3d_buffer_gl_upload_ranges(buffer_gl, context, buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); @@ -809,7 +813,8 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) } /* The caller provides a context and binds the buffer */ -static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const struct wined3d_gl_info *gl_info) +static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, + DWORD flags, const struct wined3d_gl_info *gl_info) { enum wined3d_fence_result ret; HRESULT hr; @@ -821,16 +826,17 @@ static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const if (flags & WINED3D_MAP_DISCARD) { - GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, NULL, buffer->buffer_object_usage)); + GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, + NULL, buffer_gl->b.buffer_object_usage)); checkGLcall("glBufferData"); return; } - if (!buffer->fence) + if (!buffer_gl->b.fence) { - TRACE("Creating fence for buffer %p.\n", buffer); + TRACE("Creating fence for buffer %p.\n", buffer_gl); - if (FAILED(hr = wined3d_fence_create(buffer->resource.device, &buffer->fence))) + if (FAILED(hr = wined3d_fence_create(buffer_gl->b.resource.device, &buffer_gl->b.fence))) { if (hr == WINED3DERR_NOTAVAILABLE) FIXME("Fences not supported, dropping async buffer locks.\n"); @@ -844,8 +850,8 @@ static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const return; } - TRACE("Synchronizing buffer %p.\n", buffer); - ret = wined3d_fence_wait(buffer->fence, buffer->resource.device); + TRACE("Synchronizing buffer %p.\n", buffer_gl); + ret = wined3d_fence_wait(buffer_gl->b.fence, buffer_gl->b.resource.device); switch (ret) { case WINED3D_FENCE_NOT_STARTED: @@ -863,16 +869,16 @@ static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const } drop_fence: - if (buffer->fence) + if (buffer_gl->b.fence) { - wined3d_fence_destroy(buffer->fence); - buffer->fence = NULL; + wined3d_fence_destroy(buffer_gl->b.fence); + buffer_gl->b.fence = NULL; } gl_info->gl_ops.gl.p_glFinish(); - GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); - checkGLcall("glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); - buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; + GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); + checkGLcall("glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); + buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; } static void buffer_mark_used(struct wined3d_buffer *buffer) @@ -996,18 +1002,19 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe return &buffer->resource; } -static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) +static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, + unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { - struct wined3d_device *device = buffer->resource.device; + struct wined3d_device *device = buffer_gl->b.resource.device; struct wined3d_context *context; LONG count; BYTE *base; - TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); + TRACE("buffer_gl %p, offset %u, size %u, data %p, flags %#x.\n", buffer_gl, offset, size, data, flags); - count = ++buffer->resource.map_count; + count = ++buffer_gl->b.resource.map_count; - if (buffer->buffer_object) + if (buffer_gl->b.buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; @@ -1022,18 +1029,18 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) - || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) - || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + || (!(flags & WINED3D_MAP_WRITE) && (buffer_gl->b.locations & WINED3D_LOCATION_SYSMEM)) + || buffer_gl->b.flags & WINED3D_BUFFER_PIN_SYSMEM) { - if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) + if (!(buffer_gl->b.locations & WINED3D_LOCATION_SYSMEM)) { context = context_acquire(device, NULL, 0); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_SYSMEM); context_release(context); } if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_invalidate_range(&buffer_gl->b, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); } else { @@ -1043,19 +1050,19 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI gl_info = context->gl_info; if (flags & WINED3D_MAP_DISCARD) - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + wined3d_buffer_validate_location(&buffer_gl->b, WINED3D_LOCATION_BUFFER); else - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); if (flags & WINED3D_MAP_WRITE) - buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + buffer_invalidate_bo_range(&buffer_gl->b, dirty_offset, dirty_size); - if ((flags & WINED3D_MAP_DISCARD) && buffer->resource.heap_memory) - wined3d_buffer_evict_sysmem(buffer); + if ((flags & WINED3D_MAP_DISCARD) && buffer_gl->b.resource.heap_memory) + wined3d_buffer_evict_sysmem(&buffer_gl->b); if (count == 1) { - buffer_bind(buffer, context); + wined3d_buffer_gl_bind(buffer_gl, context); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When @@ -1064,49 +1071,49 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI * buffer. The r600g driver only does this when the buffer is * currently in use, while the proprietary NVIDIA driver * appears to do this unconditionally. */ - if (buffer->flags & WINED3D_BUFFER_DISCARD) + if (buffer_gl->b.flags & WINED3D_BUFFER_DISCARD) flags &= ~WINED3D_MAP_DISCARD; if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); - buffer->map_ptr = GL_EXTCALL(glMapBufferRange(buffer->buffer_type_hint, - 0, buffer->resource.size, mapflags)); + buffer_gl->b.map_ptr = GL_EXTCALL(glMapBufferRange(buffer_gl->buffer_type_hint, + 0, buffer_gl->b.resource.size, mapflags)); checkGLcall("glMapBufferRange"); } else { - if (buffer->flags & WINED3D_BUFFER_APPLESYNC) - buffer_sync_apple(buffer, flags, gl_info); - buffer->map_ptr = GL_EXTCALL(glMapBuffer(buffer->buffer_type_hint, + if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_sync_apple(buffer_gl, flags, gl_info); + buffer_gl->b.map_ptr = GL_EXTCALL(glMapBuffer(buffer_gl->buffer_type_hint, GL_READ_WRITE)); checkGLcall("glMapBuffer"); } - if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) + if (((DWORD_PTR)buffer_gl->b.map_ptr) & (RESOURCE_ALIGNMENT - 1)) { - WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); + WARN("Pointer %p is not %u byte aligned.\n", buffer_gl->b.map_ptr, RESOURCE_ALIGNMENT); - GL_EXTCALL(glUnmapBuffer(buffer->buffer_type_hint)); + GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); checkGLcall("glUnmapBuffer"); - buffer->map_ptr = NULL; + buffer_gl->b.map_ptr = NULL; - if (buffer->resource.usage & WINED3DUSAGE_DYNAMIC) + if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) { /* The extra copy is more expensive than not using VBOs at * all on the Nvidia Linux driver, which is the only driver * that returns unaligned pointers. */ TRACE("Dynamic buffer, dropping VBO.\n"); - wined3d_buffer_drop_bo(buffer); + wined3d_buffer_drop_bo(&buffer_gl->b); } else { TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; + wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_SYSMEM); + buffer_gl->b.flags |= WINED3D_BUFFER_PIN_SYSMEM; } - TRACE("New pointer is %p.\n", buffer->resource.heap_memory); + TRACE("New pointer is %p.\n", buffer_gl->b.resource.heap_memory); } } @@ -1114,10 +1121,10 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI } if (flags & WINED3D_MAP_DISCARD) - buffer->flags |= WINED3D_BUFFER_DISCARD; + buffer_gl->b.flags |= WINED3D_BUFFER_DISCARD; } - base = buffer->map_ptr ? buffer->map_ptr : buffer->resource.heap_memory; + base = buffer_gl->b.map_ptr ? buffer_gl->b.map_ptr : buffer_gl->b.resource.heap_memory; *data = base + offset; TRACE("Returning memory at %p (base %p, offset %u).\n", *data, base, offset); @@ -1126,64 +1133,64 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI return WINED3D_OK; } -static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) +static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) { ULONG i; - TRACE("buffer %p.\n", buffer); + TRACE("buffer_gl %p.\n", buffer_gl); /* In the case that the number of Unmap calls > the * number of Map calls, d3d returns always D3D_OK. * This is also needed to prevent Map from returning garbage on * the next call (this will happen if the lock_count is < 0). */ - if (!buffer->resource.map_count) + if (!buffer_gl->b.resource.map_count) { WARN("Unmap called without a previous map call.\n"); return; } - if (--buffer->resource.map_count) + if (--buffer_gl->b.resource.map_count) { /* Delay loading the buffer until everything is unlocked */ TRACE("Ignoring unmap.\n"); return; } - if (buffer->map_ptr) + if (buffer_gl->b.map_ptr) { - struct wined3d_device *device = buffer->resource.device; + struct wined3d_device *device = buffer_gl->b.resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; context = context_acquire(device, NULL, 0); gl_info = context->gl_info; - buffer_bind(buffer, context); + wined3d_buffer_gl_bind(buffer_gl, context); if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { - for (i = 0; i < buffer->modified_areas; ++i) + for (i = 0; i < buffer_gl->b.modified_areas; ++i) { - GL_EXTCALL(glFlushMappedBufferRange(buffer->buffer_type_hint, - buffer->maps[i].offset, buffer->maps[i].size)); + GL_EXTCALL(glFlushMappedBufferRange(buffer_gl->buffer_type_hint, + buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); checkGLcall("glFlushMappedBufferRange"); } } - else if (buffer->flags & WINED3D_BUFFER_APPLESYNC) + else if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) { - for (i = 0; i < buffer->modified_areas; ++i) + for (i = 0; i < buffer_gl->b.modified_areas; ++i) { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer->buffer_type_hint, - buffer->maps[i].offset, buffer->maps[i].size)); + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, + buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } } - GL_EXTCALL(glUnmapBuffer(buffer->buffer_type_hint)); + GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); context_release(context); - buffer_clear_dirty_areas(buffer); - buffer->map_ptr = NULL; + buffer_clear_dirty_areas(&buffer_gl->b); + buffer_gl->b.map_ptr = NULL; } } @@ -1204,8 +1211,8 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); - context_copy_bo_address(context, &dst, dst_buffer->buffer_type_hint, - &src, src_buffer->buffer_type_hint, size); + context_copy_bo_address(context, &dst, wined3d_buffer_gl(dst_buffer)->buffer_type_hint, + &src, wined3d_buffer_gl(src_buffer)->buffer_type_hint, size); context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); @@ -1227,7 +1234,7 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co range.size = buffer->resource.size; } - wined3d_buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); + wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), context, data, range.offset, 1, &range); } static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, @@ -1274,7 +1281,7 @@ static void buffer_resource_preload(struct wined3d_resource *resource) static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { - struct wined3d_buffer *buffer = buffer_from_resource(resource); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); UINT offset, size; if (sub_resource_idx) @@ -1293,8 +1300,8 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc offset = size = 0; } - map_desc->row_pitch = map_desc->slice_pitch = buffer->desc.byte_width; - return wined3d_buffer_map(buffer, offset, size, (BYTE **)&map_desc->data, flags); + map_desc->row_pitch = map_desc->slice_pitch = buffer_gl->b.desc.byte_width; + return wined3d_buffer_gl_map(buffer_gl, offset, size, (BYTE **)&map_desc->data, flags); } static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) @@ -1305,7 +1312,7 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou return E_INVALIDARG; } - wined3d_buffer_unmap(buffer_from_resource(resource)); + wined3d_buffer_gl_unmap(wined3d_buffer_gl(buffer_from_resource(resource))); return WINED3D_OK; } @@ -1377,7 +1384,6 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return hr; } buffer->desc = *desc; - buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); buffer->bind_flags = desc->bind_flags; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; @@ -1444,6 +1450,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_buffer_gl *object; HRESULT hr; @@ -1456,6 +1463,8 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + object->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); + if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7bb8b81c0db..35d15e63195 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1023,8 +1023,8 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format_gl *format; + struct wined3d_buffer_gl *buffer_gl; struct wined3d_resource *resource; - struct wined3d_buffer *buffer; unsigned int offset, size; resource = view->resource; @@ -1049,13 +1049,13 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi return; } - buffer = buffer_from_resource(resource); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + buffer_gl = wined3d_buffer_gl(buffer_from_resource(resource)); + wined3d_buffer_load_location(&buffer_gl->b, context, WINED3D_LOCATION_BUFFER); wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); - get_buffer_view_range(buffer, &view->desc, &format->f, &offset, &size); - context_bind_bo(context, buffer->buffer_type_hint, buffer->buffer_object); - GL_EXTCALL(glClearBufferSubData(buffer->buffer_type_hint, format->internal, + get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); + context_bind_bo(context, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); + GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); } @@ -1092,7 +1092,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ src.buffer_object = view->counter_bo; src.addr = NULL; - context_copy_bo_address(context, &dst, buffer->buffer_type_hint, + context_copy_bo_address(context, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, &src, GL_ATOMIC_COUNTER_BUFFER, sizeof(GLuint)); wined3d_buffer_invalidate_location(buffer, ~dst_location); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0402603c527..226fdd0d3f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3760,7 +3760,6 @@ struct wined3d_buffer GLuint buffer_object; GLenum buffer_object_usage; - GLenum buffer_type_hint; unsigned int bind_flags; DWORD flags; DWORD locations; @@ -3799,6 +3798,8 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co struct wined3d_buffer_gl { struct wined3d_buffer b; + + GLenum buffer_type_hint; }; static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Introduce a separate structure for OpenGL buffer information.
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5b3419d29e0..4b66193746f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -782,7 +782,7 @@ static void wined3d_buffer_destroy_object(void *object) } heap_free(buffer->maps); - heap_free(buffer); + heap_free(wined3d_buffer_gl(buffer)); } ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) @@ -1444,7 +1444,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { - struct wined3d_buffer *object; + struct wined3d_buffer_gl *object; HRESULT hr; TRACE("device %p, desc byte_width %u, usage %s, bind_flags %s, access %s, data %p, parent %p, " @@ -1456,7 +1456,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_buffer_init(object, device, desc, data, parent, parent_ops))) + if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); heap_free(object); @@ -1465,7 +1465,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct TRACE("Created buffer %p.\n", object); - *buffer = object; + *buffer = &object->b; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3abe5e6154d..0402603c527 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3796,6 +3796,16 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; +struct wined3d_buffer_gl +{ + struct wined3d_buffer b; +}; + +static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); +} + struct wined3d_rendertarget_view { LONG refcount; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Introduce a separate structure for OpenGL device information.
by Henri Verbeet 26 Oct '18

26 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/directx.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 16 +++++++++++++--- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3d1a48321f1..800634e61a7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1745,7 +1745,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC /* Context activation is done by the caller. */ void context_bind_dummy_textures(const struct wined3d_context *context) { - const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; @@ -2286,7 +2286,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, /* If this happens to be the first context for the device, dummy textures * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ - if (device->dummy_textures.tex_2d) + if (wined3d_device_gl(device)->dummy_textures.tex_2d) context_bind_dummy_textures(context); /* Initialise all rectangles to avoid resetting unused ones later. */ @@ -2520,7 +2520,7 @@ void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint nam void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) { - const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; + const struct wined3d_dummy_textures *textures = &wined3d_device_gl(context->device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD unit = context->active_texture; DWORD old_texture_type = context->texture_type[unit]; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17ef5d90148..8b202fce0cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -523,7 +523,7 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) wined3d_decref(device->wined3d); device->wined3d = NULL; - heap_free(device); + heap_free(wined3d_device_gl(device)); TRACE("Freed device %p.\n", device); } @@ -610,7 +610,7 @@ out: /* Context activation is done by the caller. */ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - struct wined3d_dummy_textures *textures = &device->dummy_textures; + struct wined3d_dummy_textures *textures = &wined3d_device_gl(device)->dummy_textures; const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; @@ -744,7 +744,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ /* Context activation is done by the caller. */ static void destroy_dummy_textures(struct wined3d_device *device, struct wined3d_context *context) { - struct wined3d_dummy_textures *dummy_textures = &device->dummy_textures; + struct wined3d_dummy_textures *dummy_textures = &wined3d_device_gl(device)->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f4aabb53917..e65db79decd 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2419,7 +2419,7 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapte const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - struct wined3d_device *object; + struct wined3d_device_gl *device_gl; HRESULT hr; TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, " @@ -2430,20 +2430,20 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapte if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(device_gl = heap_alloc_zero(sizeof(*device_gl)))) return E_OUTOFMEMORY; - if (FAILED(hr = device_init(object, wined3d, adapter_idx, + if (FAILED(hr = device_init(&device_gl->d, wined3d, adapter_idx, device_type, focus_window, flags, surface_alignment, feature_levels, feature_level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(object); + heap_free(device_gl); return hr; } - TRACE("Created device %p.\n", object); - *device = object; + TRACE("Created device %p.\n", device_gl); + *device = &device_gl->d; device_parent->ops->wined3d_device_created(device_parent, *device); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 88dce65a15a..3abe5e6154d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3029,9 +3029,6 @@ struct wined3d_device /* The Wine logo texture */ struct wined3d_texture *logo_texture; - /* Textures for when no other textures are mapped */ - struct wined3d_dummy_textures dummy_textures; - /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ struct wined3d_sampler *default_sampler; struct wined3d_sampler *null_sampler; @@ -3059,6 +3056,19 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; +struct wined3d_device_gl +{ + struct wined3d_device d; + + /* Textures for when no other textures are bound. */ + struct wined3d_dummy_textures dummy_textures; +}; + +static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_gl, d); +} + static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { DWORD idx = state / (sizeof(*context->isStateDirty) * CHAR_BIT); -- 2.11.0

1 0