wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Józef Kucia : vkd3d-shader: Do not assume float type for arrayed shader outputs.
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: cb24be8e83f626bb1bf6f49ccb4542c85903b4ee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cb24be8e83f626bb1bf6f49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:14 2019 +0100 vkd3d-shader: Do not assume float type for arrayed shader outputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ac19aaf..f1e4a71 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4081,7 +4081,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi return; } - type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); + type_id = vkd3d_spirv_get_type_id(builder, output_info->component_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); mask = output_info->array_element_mask; mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1;

1 0

Józef Kucia : vkd3d-shader: Do not assume vec4 destination in vkd3d_dxbc_compiler_emit_store().
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: 04e2091afa27fcbbac80b95d8d3932a01c0d9735 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=04e2091afa27fcbbac80b95… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:13 2019 +0100 vkd3d-shader: Do not assume vec4 destination in vkd3d_dxbc_compiler_emit_store(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 08065f9..ac19aaf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2932,8 +2932,8 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int component_count, dst_component_count; uint32_t type_id, dst_val_id; - unsigned int component_count; assert(write_mask); @@ -2945,13 +2945,14 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, dst_id, dst_write_mask, component_type, storage_class, write_mask, val_id); } - if (component_count != VKD3D_VEC4_SIZE) + dst_component_count = vkd3d_write_mask_component_count(dst_write_mask); + if (dst_component_count != component_count) { - type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); + type_id = vkd3d_spirv_get_type_id(builder, component_type, dst_component_count); dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - dst_val_id, val_id, write_mask, component_type, VKD3D_VEC4_SIZE); + dst_val_id, val_id, write_mask, component_type, dst_component_count); } vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone);

1 0

Józef Kucia : vkd3d-shader: Call vkd3d_dxbc_compiler_leave_shader_phase() also for last phase.
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: 95b6d5222dbb059aa14b4641872c6b103185eb74 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=95b6d5222dbb059aa14b464… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:12 2019 +0100 vkd3d-shader: Call vkd3d_dxbc_compiler_leave_shader_phase() also for last phase. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 4225f8f..08065f9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7870,8 +7870,12 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; const struct vkd3d_shader_domain_shader_compile_arguments *ds_args; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; - vkd3d_spirv_build_op_function_end(builder); + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_leave_shader_phase(compiler, phase); + else + vkd3d_spirv_build_op_function_end(builder); if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL) vkd3d_dxbc_compiler_emit_hull_shader_main(compiler);

1 0

Józef Kucia : vkd3d-shader: Emit epilogue functions while leaving shader phases.
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: 38f75846b462a9b7afa5ca81a92065c92cf7a6a6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=38f75846b462a9b7afa5ca8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:11 2019 +0100 vkd3d-shader: Emit epilogue functions while leaving shader phases. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 291 +++++++++++++++++++++++++--------------------- 1 file changed, 156 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=38f75846b462a9b7afa…

1 0

Józef Kucia : vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_store().
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: 61aeaae0c2bee3b05b0f7866b37173c6164fb5d4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=61aeaae0c2bee3b05b0f786… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:10 2019 +0100 vkd3d-shader: Factor out vkd3d_dxbc_compiler_emit_store(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 75 ++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b447a13..01f9080 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2908,65 +2908,80 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src_with_type(struct vkd3d_dxbc_co } static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, - const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) + uint32_t dst_id, unsigned int dst_write_mask, enum vkd3d_component_type component_type, + SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, id, index[1]; + uint32_t type_id, ptr_type_id, index[1]; unsigned int component_idx; - assert(reg->type != VKD3DSPR_IMMCONST); - - id = reg_info->id; - if (vkd3d_write_mask_component_count(reg_info->write_mask) > 1) + if (vkd3d_write_mask_component_count(dst_write_mask) > 1) { - type_id = vkd3d_spirv_get_type_id(builder, reg_info->component_type, 1); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); + type_id = vkd3d_spirv_get_type_id(builder, component_type, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, id, index, ARRAY_SIZE(index)); + dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, dst_id, index, ARRAY_SIZE(index)); + } + + vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); +} + +static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, + uint32_t dst_id, unsigned int dst_write_mask, enum vkd3d_component_type component_type, + SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, dst_val_id; + unsigned int component_count; + + assert(write_mask); + + component_count = vkd3d_write_mask_component_count(write_mask); + + if (component_count == 1) + { + return vkd3d_dxbc_compiler_emit_store_scalar(compiler, + dst_id, dst_write_mask, component_type, storage_class, write_mask, val_id); + } + + if (component_count != VKD3D_VEC4_SIZE) + { + type_id = vkd3d_spirv_get_type_id(builder, component_type, VKD3D_VEC4_SIZE); + dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); + + val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, + dst_val_id, val_id, write_mask, component_type, VKD3D_VEC4_SIZE); } - vkd3d_spirv_build_op_store(builder, id, val_id, SpvMemoryAccessMaskNone); + vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); } static void vkd3d_dxbc_compiler_emit_store_reg(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) + const struct vkd3d_shader_register *reg, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register_info reg_info; enum vkd3d_component_type component_type; - uint32_t type_id, reg_val_id; - unsigned int component_count; + uint32_t type_id; assert(reg->type != VKD3DSPR_IMMCONST); - assert(write_mask); - component_count = vkd3d_write_mask_component_count(write_mask); - component_type = vkd3d_component_type_from_data_type(reg->data_type); if (!vkd3d_dxbc_compiler_get_register_info(compiler, reg, &reg_info)) return; vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + component_type = vkd3d_component_type_from_data_type(reg->data_type); if (component_type != reg_info.component_type) { + unsigned int component_count = vkd3d_write_mask_component_count(write_mask); type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, component_count); val_id = vkd3d_spirv_build_op_bitcast(builder, type_id, val_id); + component_type = reg_info.component_type; } - if (component_count == 1) - return vkd3d_dxbc_compiler_emit_store_scalar(compiler, reg, write_mask, &reg_info, val_id); - - if (component_count != VKD3D_VEC4_SIZE) - { - type_id = vkd3d_spirv_get_type_id(builder, reg_info.component_type, VKD3D_VEC4_SIZE); - reg_val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); - - val_id = vkd3d_dxbc_compiler_emit_vector_shuffle(compiler, - reg_val_id, val_id, write_mask, reg_info.component_type, VKD3D_VEC4_SIZE); - } - - vkd3d_spirv_build_op_store(builder, reg_info.id, val_id, SpvMemoryAccessMaskNone); + vkd3d_dxbc_compiler_emit_store(compiler, + reg_info.id, reg_info.write_mask, component_type, reg_info.storage_class, write_mask, val_id); } static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : vkd3d-shader: Merge ifs in vkd3d_dxbc_compiler_emit_swizzle_ext().
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: 64f7ff38981b2ec13da7af07ff48e7f0c23fe727 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=64f7ff38981b2ec13da7af0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 25 11:59:09 2019 +0100 vkd3d-shader: Merge ifs in vkd3d_dxbc_compiler_emit_swizzle_ext(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5ed4df2..b447a13 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2633,14 +2633,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler val_component_count = vkd3d_write_mask_component_count(val_write_mask); if (component_count == val_component_count - && vkd3d_swizzle_is_equal(val_write_mask, swizzle, write_mask)) + && (component_count == 1 || vkd3d_swizzle_is_equal(val_write_mask, swizzle, write_mask))) return val_id; type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); - if (component_count == 1 && val_component_count == 1) - return val_id; - if (component_count == 1) { component_idx = vkd3d_write_mask_get_component_idx(write_mask);

1 0

Philip Rebohle : vkd3d-shader: Decorate integer fragment shader builtins as flat.
by Alexandre Julliard 25 Feb '19

25 Feb '19

Module: vkd3d Branch: master Commit: c560fdfa269c41fd5c9c20ef2afa8a5d6c4595ef URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c560fdfa269c41fd5c9c20e… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Sat Feb 23 15:25:51 2019 +0100 vkd3d-shader: Decorate integer fragment shader builtins as flat. >From the Vulkan spec, 8.13 "Interpolation Decorations": Fragment shader inputs that are signed or unsigned integers, integer vectors, or any double-precision floating-point type must be decorated with Flat. This also matches glslang behaviour. Specifically, this fixes tone-mapping in Unreal Engine 4 on RADV and AMDGPU-PRO, where gl_Layer is used as a fragment shader input. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 82598df..5ed4df2 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3489,6 +3489,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp vkd3d_spirv_add_iface_variable(builder, id); vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + if (compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL && storage_class == SpvStorageClassInput + && builtin->component_type != VKD3D_TYPE_FLOAT && builtin->component_type != VKD3D_TYPE_BOOL) + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); + return id; }

1 0

Zebediah Figura : wined3d: Rename HIGHEST_TRANSFORMSTATE to WINED3D_HIGHEST_TRANSFORM_STATE.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: b3c5b7da9442af840431cd7f795da20989aad42a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3c5b7da9442af840431cd7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:53:56 2019 -0600 wined3d: Rename HIGHEST_TRANSFORMSTATE to WINED3D_HIGHEST_TRANSFORM_STATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16a1956..4caa1e8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1550,7 +1550,7 @@ void CDECL wined3d_device_multiply_transform(struct wined3d_device *device, TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix); - if (state > HIGHEST_TRANSFORMSTATE) + if (state > WINED3D_HIGHEST_TRANSFORM_STATE) { WARN("Unhandled transform state %#x.\n", state); return; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b8b02c8..7495d21 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -214,7 +214,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->streamSource = 0xffff; states->streamFreq = 0xffff; states->textures = 0xfffff; - stateblock_set_bits(states->transform, HIGHEST_TRANSFORMSTATE + 1); + stateblock_set_bits(states->transform, WINED3D_HIGHEST_TRANSFORM_STATE + 1); stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; @@ -300,7 +300,7 @@ void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) } } - for (i = 0; i <= HIGHEST_TRANSFORMSTATE >> 5; ++i) + for (i = 0; i <= WINED3D_HIGHEST_TRANSFORM_STATE >> 5; ++i) { DWORD map = stateblock->changed.transform[i]; for (j = 0; map; map >>= 1, ++j) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 297a254..cd49789 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1446,7 +1446,7 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col wined3d_color->a = D3DCOLOR_B_A(d3d_color) / 255.0f; } -#define HIGHEST_TRANSFORMSTATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ +#define WINED3D_HIGHEST_TRANSFORM_STATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, const char *file, unsigned int line, const char *name) DECLSPEC_HIDDEN; @@ -2938,7 +2938,7 @@ struct wined3d_state DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; + struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS]; @@ -3000,7 +3000,7 @@ struct wined3d_stateblock_state DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; - struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; + struct wined3d_matrix transforms[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewport; @@ -3565,7 +3565,7 @@ struct wined3d_vertex_declaration struct wined3d_saved_states { - DWORD transform[(HIGHEST_TRANSFORMSTATE >> 5) + 1]; + DWORD transform[(WINED3D_HIGHEST_TRANSFORM_STATE >> 5) + 1]; WORD streamSource; /* WINED3D_MAX_STREAMS, 16 */ WORD streamFreq; /* WINED3D_MAX_STREAMS, 16 */ DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; @@ -3607,7 +3607,7 @@ struct wined3d_stateblock /* Contained state management */ DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; unsigned int num_contained_render_states; - DWORD contained_transform_states[HIGHEST_TRANSFORMSTATE + 1]; + DWORD contained_transform_states[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; unsigned int num_contained_transform_states; DWORD contained_vs_consts_i[WINED3D_MAX_CONSTS_I]; unsigned int num_contained_vs_consts_i;

1 0

Zebediah Figura : wined3d: Rename MAX_CLIP_DISTANCES to WINED3D_MAX_CLIP_DISTANCES.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 4b17bad34838d9378f952cffce32a398e04e8ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b17bad34838d9378f952cff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:53:55 2019 -0600 wined3d: Rename MAX_CLIP_DISTANCES to WINED3D_MAX_CLIP_DISTANCES. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 2 +- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c75b19e..acfed24 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -2870,7 +2870,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct gl_info->limits.arb_ps_temps = 0; gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_CLIP_DISTANCES, &gl_max); - gl_info->limits.user_clip_distances = min(MAX_CLIP_DISTANCES, gl_max); + gl_info->limits.user_clip_distances = min(WINED3D_MAX_CLIP_DISTANCES, gl_max); TRACE("Clip plane support - max planes %d.\n", gl_max); if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1a24a66..660005f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -257,7 +257,7 @@ struct glsl_shader_prog_link DWORD constant_update_mask; unsigned int constant_version; DWORD shader_controlled_clip_distances : 1; - DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD padding : 23; }; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8faae3a..83a793d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -966,7 +966,7 @@ static HRESULT shader_calculate_clip_or_cull_distance_mask( /* Clip and cull distances are packed in 4 component registers. 0 and 1 are * the only allowed semantic indices. */ - if (e->semantic_idx >= MAX_CLIP_DISTANCES / 4) + if (e->semantic_idx >= WINED3D_MAX_CLIP_DISTANCES / 4) { *mask = 0; WARN("Invalid clip/cull distance index %u.\n", e->semantic_idx); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 50b7135..b8b02c8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -218,7 +218,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; - states->clipplane = (1u << MAX_CLIP_DISTANCES) - 1; + states->clipplane = (1u << WINED3D_MAX_CLIP_DISTANCES) - 1; states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff; states->vertexShaderConstantsB = 0xffff; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77f97a8..297a254 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -264,7 +264,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define WINED3D_MAX_VERTEX_SAMPLERS 4 #define WINED3D_MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) #define WINED3D_MAX_ACTIVE_LIGHTS 8 -#define MAX_CLIP_DISTANCES 8 +#define WINED3D_MAX_CLIP_DISTANCES 8 #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 @@ -1009,8 +1009,8 @@ struct wined3d_shader_reg_maps DWORD uav_read_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ DWORD uav_counter_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ - DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ - DWORD cull_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ + DWORD cull_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD usesnrm : 1; DWORD vpos : 1; DWORD usesdsx : 1; @@ -1621,9 +1621,9 @@ enum wined3d_pipeline #define STATE_IS_SCISSORRECT(a) ((a) == STATE_SCISSORRECT) #define STATE_CLIPPLANE(a) (STATE_SCISSORRECT + 1 + (a)) -#define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(MAX_CLIP_DISTANCES - 1)) +#define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(WINED3D_MAX_CLIP_DISTANCES - 1)) -#define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIP_DISTANCES)) +#define STATE_MATERIAL (STATE_CLIPPLANE(WINED3D_MAX_CLIP_DISTANCES)) #define STATE_IS_MATERIAL(a) ((a) == STATE_MATERIAL) #define STATE_RASTERIZER (STATE_MATERIAL + 1) @@ -1921,7 +1921,7 @@ struct wined3d_context DWORD transform_feedback_active : 1; DWORD transform_feedback_paused : 1; DWORD shader_update_mask : 6; /* WINED3D_SHADER_TYPE_COUNT, 6 */ - DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD num_untracked_materials : 2; /* Max value 2 */ DWORD padding : 7; @@ -2939,7 +2939,7 @@ struct wined3d_state DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; - struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; + struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewports[WINED3D_MAX_VIEWPORTS]; unsigned int viewport_count; @@ -3001,7 +3001,7 @@ struct wined3d_stateblock_state DWORD texture_states[WINED3D_MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; - struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; + struct wined3d_vec4 clip_planes[WINED3D_MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewport; RECT scissor_rect;

1 0

Zebediah Figura : wined3d: Rename MAX_ACTIVE_LIGHTS to WINED3D_MAX_ACTIVE_LIGHTS.
by Alexandre Julliard 22 Feb '19

22 Feb '19

Module: wine Branch: master Commit: 10ecdca9ccedf1244d15973435d5fdde4e4bb66b URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ecdca9ccedf1244d159734… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 21 18:53:54 2019 -0600 wined3d: Rename MAX_ACTIVE_LIGHTS to WINED3D_MAX_ACTIVE_LIGHTS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2e87e5f..1a24a66 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -181,7 +181,7 @@ struct glsl_vs_program GLint q_att; GLint cos_htheta; GLint cos_hphi; - } light_location[MAX_ACTIVE_LIGHTS]; + } light_location[WINED3D_MAX_ACTIVE_LIGHTS]; GLint pointsize_location; GLint pointsize_min_location; GLint pointsize_max_location; @@ -1892,7 +1892,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context DWORD directional_count = 0; DWORD parallel_point_count = 0; - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { if (!state->light_state.lights[i]) continue; @@ -1922,7 +1922,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context parallel_point_idx = directional_idx + directional_count; shader_glsl_ffp_vertex_lightambient_uniform(context, state, prog); - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { const struct wined3d_light_info *light_info = state->light_state.lights[i]; unsigned int idx; @@ -9185,7 +9185,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr shader_addline(buffer, " float q_att;\n"); shader_addline(buffer, " float cos_htheta;\n"); shader_addline(buffer, " float cos_hphi;\n"); - shader_addline(buffer, "} ffp_light[%u];\n", MAX_ACTIVE_LIGHTS); + shader_addline(buffer, "} ffp_light[%u];\n", WINED3D_MAX_ACTIVE_LIGHTS); if (settings->point_size) { @@ -10132,7 +10132,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->material_emissive_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emissive")); vs->material_shininess_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.shininess")); vs->light_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_light_ambient")); - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { string_buffer_sprintf(name, "ffp_light[%u].diffuse", i); vs->light_location[i].diffuse = GL_EXTCALL(glGetUniformLocation(program_id, name->buffer)); @@ -11661,7 +11661,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, caps->xyzrhw = TRUE; caps->emulated_flatshading = !needs_legacy_glsl_syntax(gl_info); caps->ffp_generic_attributes = TRUE; - caps->max_active_lights = MAX_ACTIVE_LIGHTS; + caps->max_active_lights = WINED3D_MAX_ACTIVE_LIGHTS; caps->max_vertex_blend_matrices = MAX_VERTEX_BLENDS; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0194917..50b7135 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -579,7 +579,7 @@ void state_cleanup(struct wined3d_state *state) if (!(state->flags & WINED3D_STATE_NO_REF)) state_unbind_resources(state); - for (counter = 0; counter < MAX_ACTIVE_LIGHTS; ++counter) + for (counter = 0; counter < WINED3D_MAX_ACTIVE_LIGHTS; ++counter) { state->light_state.lights[counter] = NULL; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd45240..062f866 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6279,7 +6279,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { if (!state->light_state.lights[i]) continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d646e9e..77f97a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -263,7 +263,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define WINED3D_MAX_FRAGMENT_SAMPLERS 16 #define WINED3D_MAX_VERTEX_SAMPLERS 4 #define WINED3D_MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) -#define MAX_ACTIVE_LIGHTS 8 +#define WINED3D_MAX_ACTIVE_LIGHTS 8 #define MAX_CLIP_DISTANCES 8 #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 @@ -1615,9 +1615,9 @@ enum wined3d_pipeline #define STATE_LIGHT_TYPE (STATE_VIEWPORT + 1) #define STATE_IS_LIGHT_TYPE(a) ((a) == STATE_LIGHT_TYPE) #define STATE_ACTIVELIGHT(a) (STATE_LIGHT_TYPE + 1 + (a)) -#define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS)) +#define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_ACTIVELIGHT(WINED3D_MAX_ACTIVE_LIGHTS)) -#define STATE_SCISSORRECT (STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS - 1) + 1) +#define STATE_SCISSORRECT (STATE_ACTIVELIGHT(WINED3D_MAX_ACTIVE_LIGHTS - 1) + 1) #define STATE_IS_SCISSORRECT(a) ((a) == STATE_SCISSORRECT) #define STATE_CLIPPLANE(a) (STATE_SCISSORRECT + 1 + (a)) @@ -2896,7 +2896,7 @@ struct wined3d_light_state { /* Light hashmap. Collisions are handled using linked lists. */ struct list light_map[LIGHTMAP_SIZE]; - const struct wined3d_light_info *lights[MAX_ACTIVE_LIGHTS]; + const struct wined3d_light_info *lights[WINED3D_MAX_ACTIVE_LIGHTS]; }; #define WINED3D_STATE_NO_REF 0x00000001

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019