September 2023 - Wine-Commits

Francisco Casas : vkd3d-shader/d3d-asm: Use vkd3d_shader_register.dimension to know when to dump swizzle.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: a358722f71cc9c8e1a6adfe3d5a7d6b7706ff0c7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a358722f71cc9c8e1a6adfe3d5a7d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Aug 16 01:33:43 2023 -0400 vkd3d-shader/d3d-asm: Use vkd3d_shader_register.dimension to know when to dump swizzle. The assumption that sampler registers never have a swizzle is not totally correct. For instance, for the following shader: Texture2D tex; sampler sam; float4 main() : sv_target { return tex.GatherGreen(sam, float2(0, 0)); } the gather instruction is being disassembled as gather4_indexable(texture2d) o0.xyzw, l(0.0, 0.0, 0.0, 0.0), t0.xyzw, s0 instead of gather4_indexable(texture2d)(float,float,float,float) o0.xyzw, l(0.0, 0.0, 0.0, 0.0), t0.xyzw, s0.y (notice the missing swizzle in the last parameter s0). This is because the Gather instructions give the sampler register a vec4 dimension (and scalar swizzle type) to indicate the channel for the gather operation. The solution is using the new vkd3d_shader_register.dimension instead of checking the swizzle type. --- libs/vkd3d-shader/d3d_asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 4582b22a..7df2f163 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -1330,7 +1330,7 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, } if (param->reg.type != VKD3DSPR_IMMCONST && param->reg.type != VKD3DSPR_IMMCONST64 - && param->reg.type != VKD3DSPR_SAMPLER) + && param->reg.dimension == VSIR_DIMENSION_VEC4) { unsigned int swizzle_x = vkd3d_swizzle_get_component(swizzle, 0); unsigned int swizzle_y = vkd3d_swizzle_get_component(swizzle, 1);

1 0

Martin Storsjö : include: Add an #include of d3d12sdklayers.h in vkd3d_d3d12.idl.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: e44a1927e5db95f6c904cfb160586bda3d2fa442 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e44a1927e5db95f6c904cfb160586… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Sep 27 14:41:20 2023 +0300 include: Add an #include of d3d12sdklayers.h in vkd3d_d3d12.idl. This matches what is done in the upstream headers; end users including d3d12.h don't need to explicitly include d3d12sdklayers.h. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/vkd3d_d3d12.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 71faf611..9b1b494c 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -5083,6 +5083,10 @@ interface ID3D12GraphicsCommandList7 : ID3D12GraphicsCommandList6 const D3D12_BARRIER_GROUP *barrier_groups); }; +cpp_quote("#ifndef D3D12_IGNORE_SDK_LAYERS") +cpp_quote("#include \"vkd3d_d3d12sdklayers.h\"") +cpp_quote("#endif") + typedef HRESULT (__stdcall *PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER)( const void *data, SIZE_T data_size, REFIID iid, void **deserializer);

1 0

Francisco Casas : vkd3d-shader/tpf: Replace sm4_register with vkd3d_shader_register.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: 8e0fe29bfcf14052901e0840bd569dd022838c0f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8e0fe29bfcf14052901e0840bd569… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Aug 31 16:28:13 2023 -0400 vkd3d-shader/tpf: Replace sm4_register with vkd3d_shader_register. --- libs/vkd3d-shader/tpf.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 12fa070c..c79b8057 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3603,18 +3603,6 @@ static uint32_t sm4_encode_instruction_modifier(const struct sm4_instruction_mod return word; } -struct sm4_register -{ - enum vkd3d_shader_register_type type; - struct vkd3d_shader_register_index idx[2]; - unsigned int idx_count; - enum vsir_dimension dimension; - union - { - uint32_t immconst_uint[4]; - } u; -}; - struct sm4_instruction { enum vkd3d_sm4_opcode opcode; @@ -3624,14 +3612,14 @@ struct sm4_instruction struct sm4_dst_register { - struct sm4_register reg; + struct vkd3d_shader_register reg; unsigned int writemask; } dsts[2]; unsigned int dst_count; struct sm4_src_register { - struct sm4_register reg; + struct vkd3d_shader_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; unsigned int swizzle; unsigned int mod; @@ -3644,7 +3632,7 @@ struct sm4_instruction unsigned int idx_count; }; -static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *reg, +static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct vkd3d_shader_register *reg, unsigned int *writemask, enum vkd3d_sm4_swizzle_type *swizzle_type, const struct hlsl_deref *deref) { @@ -3794,7 +3782,7 @@ static void sm4_src_from_deref(struct hlsl_ctx *ctx, struct sm4_src_register *sr src->swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), map_writemask); } -static void sm4_register_from_node(struct sm4_register *reg, unsigned int *writemask, +static void sm4_register_from_node(struct vkd3d_shader_register *reg, unsigned int *writemask, enum vkd3d_sm4_swizzle_type *swizzle_type, const struct hlsl_ir_node *instr) { assert(instr->reg.allocated); @@ -4452,7 +4440,7 @@ static void write_sm4_ld(const struct tpf_writer *tpf, const struct hlsl_ir_node { if (sample_index->type == HLSL_IR_CONSTANT) { - struct sm4_register *reg = &instr.srcs[2].reg; + struct vkd3d_shader_register *reg = &instr.srcs[2].reg; struct hlsl_ir_constant *index; index = hlsl_ir_constant(sample_index);

1 0

Francisco Casas : vkd3d-shader/tpf: Move sm4_register.mod to sm4_src_register.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: 10bbc7eda5bc3a7d64b5dd2b5db06abb47d4667f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/10bbc7eda5bc3a7d64b5dd2b5db06… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jul 17 17:17:31 2023 -0400 vkd3d-shader/tpf: Move sm4_register.mod to sm4_src_register. --- libs/vkd3d-shader/tpf.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c571c2dd..12fa070c 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3613,7 +3613,6 @@ struct sm4_register { uint32_t immconst_uint[4]; } u; - unsigned int mod; }; struct sm4_instruction @@ -3635,6 +3634,7 @@ struct sm4_instruction struct sm4_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; unsigned int swizzle; + unsigned int mod; } srcs[5]; unsigned int src_count; @@ -3920,12 +3920,12 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm token |= (uint32_t)src->swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; token |= src->swizzle << VKD3D_SM4_SWIZZLE_SHIFT; } - if (src->reg.mod) + if (src->mod) token |= VKD3D_SM4_EXTENDED_OPERAND; put_u32(buffer, token); - if (src->reg.mod) - put_u32(buffer, (src->reg.mod << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + if (src->mod) + put_u32(buffer, (src->mod << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER); for (j = 0; j < src->reg.idx_count; ++j) @@ -3946,13 +3946,22 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm } } -static uint32_t sm4_register_order(const struct sm4_register *reg) +static uint32_t sm4_dst_register_order(const struct sm4_dst_register *dst) { uint32_t order = 1; - if (reg->type == VKD3DSPR_IMMCONST) - order += reg->dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; - order += reg->idx_count; - if (reg->mod) + if (dst->reg.type == VKD3DSPR_IMMCONST) + order += dst->reg.dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; + order += dst->reg.idx_count; + return order; +} + +static uint32_t sm4_src_register_order(const struct sm4_src_register *src) +{ + uint32_t order = 1; + if (src->reg.type == VKD3DSPR_IMMCONST) + order += src->reg.dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; + order += src->reg.idx_count; + if (src->mod) ++order; return order; } @@ -3965,9 +3974,9 @@ static void write_sm4_instruction(const struct tpf_writer *tpf, const struct sm4 size += instr->modifier_count; for (i = 0; i < instr->dst_count; ++i) - size += sm4_register_order(&instr->dsts[i].reg); + size += sm4_dst_register_order(&instr->dsts[i]); for (i = 0; i < instr->src_count; ++i) - size += sm4_register_order(&instr->srcs[i].reg); + size += sm4_src_register_order(&instr->srcs[i]); size += instr->idx_count; if (instr->byte_stride) ++size; @@ -4281,7 +4290,7 @@ static void write_sm4_unary_op(const struct tpf_writer *tpf, enum vkd3d_sm4_opco instr.dst_count = 1; sm4_src_from_node(&instr.srcs[0], src, instr.dsts[0].writemask); - instr.srcs[0].reg.mod = src_mod; + instr.srcs[0].mod = src_mod; instr.src_count = 1; write_sm4_instruction(tpf, &instr);

1 0

Francisco Casas : vkd3d-shader/tpf: Put sm4_register.immconst_uint inside a union.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: 8124ba3a54e07ac05952dea91e68d612a4962cb4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8124ba3a54e07ac05952dea91e68d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Aug 30 21:46:24 2023 -0400 vkd3d-shader/tpf: Put sm4_register.immconst_uint inside a union. --- libs/vkd3d-shader/tpf.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 22006fac..c571c2dd 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3609,7 +3609,10 @@ struct sm4_register struct vkd3d_shader_register_index idx[2]; unsigned int idx_count; enum vsir_dimension dimension; - uint32_t immconst_uint[4]; + union + { + uint32_t immconst_uint[4]; + } u; unsigned int mod; }; @@ -3818,7 +3821,7 @@ static void sm4_src_from_constant_value(struct sm4_src_register *src, if (width == 1) { src->reg.dimension = VSIR_DIMENSION_SCALAR; - src->reg.immconst_uint[0] = value->u[0].u; + src->reg.u.immconst_uint[0] = value->u[0].u; } else { @@ -3828,9 +3831,9 @@ static void sm4_src_from_constant_value(struct sm4_src_register *src, for (i = 0; i < 4; ++i) { if ((map_writemask & (1u << i)) && (j < width)) - src->reg.immconst_uint[i] = value->u[j++].u; + src->reg.u.immconst_uint[i] = value->u[j++].u; else - src->reg.immconst_uint[i] = 0; + src->reg.u.immconst_uint[i] = 0; } } } @@ -3933,12 +3936,12 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm if (src->reg.type == VKD3DSPR_IMMCONST) { - put_u32(buffer, src->reg.immconst_uint[0]); + put_u32(buffer, src->reg.u.immconst_uint[0]); if (reg_dim == VKD3D_SM4_DIMENSION_VEC4) { - put_u32(buffer, src->reg.immconst_uint[1]); - put_u32(buffer, src->reg.immconst_uint[2]); - put_u32(buffer, src->reg.immconst_uint[3]); + put_u32(buffer, src->reg.u.immconst_uint[1]); + put_u32(buffer, src->reg.u.immconst_uint[2]); + put_u32(buffer, src->reg.u.immconst_uint[3]); } } } @@ -4449,7 +4452,7 @@ static void write_sm4_ld(const struct tpf_writer *tpf, const struct hlsl_ir_node instr.srcs[2].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; reg->type = VKD3DSPR_IMMCONST; reg->dimension = VSIR_DIMENSION_SCALAR; - reg->immconst_uint[0] = index->value.u[0].u; + reg->u.immconst_uint[0] = index->value.u[0].u; } else if (tpf->ctx->profile->major_version == 4 && tpf->ctx->profile->minor_version == 0) { @@ -4611,7 +4614,7 @@ static void write_sm4_cast_from_bool(const struct tpf_writer *tpf, const struct instr.srcs[1].swizzle_type = VKD3D_SM4_SWIZZLE_NONE; instr.srcs[1].reg.type = VKD3DSPR_IMMCONST; instr.srcs[1].reg.dimension = VSIR_DIMENSION_SCALAR; - instr.srcs[1].reg.immconst_uint[0] = mask; + instr.srcs[1].reg.u.immconst_uint[0] = mask; instr.src_count = 2; write_sm4_instruction(tpf, &instr);

1 0

Francisco Casas : vkd3d-shader/tpf: Turn sm4_register.dim into an enum vkd3d_shader_dimension.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: 0c8b74cb3962ad17e79f93e464a9b87a707641f0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0c8b74cb3962ad17e79f93e464a9b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Aug 30 21:21:08 2023 -0400 vkd3d-shader/tpf: Turn sm4_register.dim into an enum vkd3d_shader_dimension. --- libs/vkd3d-shader/tpf.c | 64 ++++++++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 25 deletions(-)

1 0

Biswapriyo Nath : include: Add some structures in d3d12video.idl.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: wine Branch: master Commit: 6786d38aa2d1c8e3f53960bb8566bf11d99e1cdd URL: https://gitlab.winehq.org/wine/wine/-/commit/6786d38aa2d1c8e3f53960bb8566bf… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Sep 27 04:26:42 2023 +0000 include: Add some structures in d3d12video.idl. --- include/d3d12video.idl | 155 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+)

1 0

Giovanni Mascellani : ci: Prepend an ordinal number to commits in artifacts.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: 7366b5fd38fa283ffa316839520f07e83febe21c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7366b5fd38fa283ffa316839520f0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Sep 26 23:03:31 2023 +0200 ci: Prepend an ordinal number to commits in artifacts. --- gitlab/build-crosstest | 2 +- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 7963e58b..5561bffb 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -3,7 +3,7 @@ echo "Building $(git log -1)" echo "---" -COMMIT=$(git rev-parse --short HEAD) +COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail diff --git a/gitlab/build-linux b/gitlab/build-linux index 318bbba4..566d772f 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -3,7 +3,7 @@ echo "Building $(git log -1)" echo "---" -COMMIT=$(git rev-parse --short HEAD) +COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail diff --git a/gitlab/build-mac b/gitlab/build-mac index ffa46d67..23c1ea96 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -3,7 +3,7 @@ echo "Building $(git log -1)" echo "---" -COMMIT=$(git rev-parse --short HEAD) +COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail

1 0

Giovanni Mascellani : ci: Build vkd3d with MinGW too.
by Alexandre Julliard Sept. 27, 2023

Sept. 27, 2023

Module: vkd3d Branch: master Commit: e85e2417d54c42f7b9e0830dab9426c47b052644 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e85e2417d54c42f7b9e0830dab942… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Sep 22 23:13:25 2023 +0200 ci: Build vkd3d with MinGW too. Nowadays vkd3d is probably most commonly used compiled as PE rather then ELF, so it makes sense to at least ensure that compilation succeeds. In the future it would be nice to somehow test these binaries as well. --- gitlab/build-mingw | 24 ++++++++++++++++++++++++ gitlab/build.yml | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/gitlab/build-mingw b/gitlab/build-mingw new file mode 100755 index 00000000..0f9ab3a6 --- /dev/null +++ b/gitlab/build-mingw @@ -0,0 +1,24 @@ +#!/bin/bash + +echo "Building $(git log -1)" +echo "---" + +COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) + +set -Eeuxo pipefail + +./autogen.sh +rm -fr build +mkdir build +cd build +mkdir vulkan-headers +cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers +../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds" LDFLAGS="-static-libgcc" && \ + make -j$(nproc) && \ + make -j$(nproc) install DESTDIR="$PWD/destdir" || \ + touch ../pipeline_failed + +mkdir -p ../artifacts/$COMMIT +cp destdir/usr/local/bin/* ../artifacts/$COMMIT + +git reset --hard diff --git a/gitlab/build.yml b/gitlab/build.yml index e78e7081..6a260510 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -82,6 +82,41 @@ build-crosstest: paths: - artifacts +.build-mingw: + stage: build + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + image: $CI_REGISTRY/wine/vkd3d:debian-bookworm + interruptible: true + needs: + - job: build-image + optional: true + dependencies: [] + script: + - git config --global --add safe.directory $CI_PROJECT_DIR + - git clean -fdx + - git reset --hard + - rm -fr .git/rebase-merge + - mkdir artifacts + - cat /proc/cpuinfo > artifacts/cpuinfo.txt + - cat /proc/meminfo > artifacts/meminfo.txt + - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mingw + - if [ -f pipeline_failed ] ; then exit 1 ; fi + artifacts: + when: always + paths: + - artifacts + +build-mingw-64: + extends: .build-mingw + variables: + HOST: "x86_64-w64-mingw32" + +build-mingw-32: + extends: .build-mingw + variables: + HOST: "i686-w64-mingw32" + build-mac: stage: build rules:

1 0

Zebediah Figura : wined3d: Move struct wined3d_stateblock into stateblock.c.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: a2c552f723a3aa65eca6e518266c8b9bde4e7176 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2c552f723a3aa65eca6e518266c8b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 17:05:34 2022 -0600 wined3d: Move struct wined3d_stateblock into stateblock.c. --- dlls/wined3d/stateblock.c | 57 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 59 ------------------------------------------ 2 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b263bbb8fda..c8d62ad9f85 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -28,6 +28,63 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); +struct wined3d_saved_states +{ + uint32_t vs_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_VS_CONSTS_F)]; + uint16_t vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ + uint16_t vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ + uint32_t ps_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_PS_CONSTS_F)]; + uint16_t pixelShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ + uint16_t pixelShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ + uint32_t transform[WINED3D_BITMAP_SIZE(WINED3D_HIGHEST_TRANSFORM_STATE + 1)]; + uint16_t streamSource; /* WINED3D_MAX_STREAMS, 16 */ + uint16_t streamFreq; /* WINED3D_MAX_STREAMS, 16 */ + uint32_t renderState[WINED3D_BITMAP_SIZE(WINEHIGHEST_RENDER_STATE + 1)]; + uint32_t textureState[WINED3D_MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ + uint16_t samplerState[WINED3D_MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ + uint32_t clipplane; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ + uint32_t textures : 20; /* WINED3D_MAX_COMBINED_SAMPLERS, 20 */ + uint32_t indices : 1; + uint32_t material : 1; + uint32_t viewport : 1; + uint32_t vertexDecl : 1; + uint32_t pixelShader : 1; + uint32_t vertexShader : 1; + uint32_t scissorRect : 1; + uint32_t store_stream_offset : 1; + uint32_t alpha_to_coverage : 1; + uint32_t lights : 1; + uint32_t transforms : 1; + uint32_t padding : 1; + + struct list changed_lights; +}; + +struct stage_state +{ + unsigned int stage, state; +}; + +struct wined3d_stateblock +{ + LONG ref; + struct wined3d_device *device; + + struct wined3d_saved_states changed; + + struct wined3d_stateblock_state stateblock_state; + struct wined3d_light_state light_state; + + unsigned int contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; + unsigned int num_contained_render_states; + unsigned int contained_transform_states[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; + unsigned int num_contained_transform_states; + struct stage_state contained_tss_states[WINED3D_MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)]; + unsigned int num_contained_tss_states; + struct stage_state contained_sampler_states[WINED3D_MAX_COMBINED_SAMPLERS * WINED3D_HIGHEST_SAMPLER_STATE]; + unsigned int num_contained_sampler_states; +}; + static const DWORD pixel_states_render[] = { WINED3D_RS_ALPHABLENDENABLE, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c89bd191255..0b92ae52e64 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3549,65 +3549,6 @@ struct wined3d_vertex_declaration BOOL position_transformed; }; -struct wined3d_saved_states -{ - uint32_t vs_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_VS_CONSTS_F)]; - WORD vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ - WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ - uint32_t ps_consts_f[WINED3D_BITMAP_SIZE(WINED3D_MAX_PS_CONSTS_F)]; - WORD pixelShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ - WORD pixelShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ - uint32_t transform[WINED3D_BITMAP_SIZE(WINED3D_HIGHEST_TRANSFORM_STATE + 1)]; - WORD streamSource; /* WINED3D_MAX_STREAMS, 16 */ - WORD streamFreq; /* WINED3D_MAX_STREAMS, 16 */ - uint32_t renderState[WINED3D_BITMAP_SIZE(WINEHIGHEST_RENDER_STATE + 1)]; - DWORD textureState[WINED3D_MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ - WORD samplerState[WINED3D_MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ - DWORD clipplane; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ - DWORD textures : 20; /* WINED3D_MAX_COMBINED_SAMPLERS, 20 */ - DWORD indices : 1; - DWORD material : 1; - DWORD viewport : 1; - DWORD vertexDecl : 1; - DWORD pixelShader : 1; - DWORD vertexShader : 1; - DWORD scissorRect : 1; - DWORD store_stream_offset : 1; - DWORD alpha_to_coverage : 1; - DWORD lights : 1; - DWORD transforms : 1; - DWORD padding : 1; - - struct list changed_lights; -}; - -struct StageState { - DWORD stage; - DWORD state; -}; - -struct wined3d_stateblock -{ - LONG ref; /* Note: Ref counting not required */ - struct wined3d_device *device; - - /* Array indicating whether things have been set or changed */ - struct wined3d_saved_states changed; - - struct wined3d_stateblock_state stateblock_state; - struct wined3d_light_state light_state; - - /* Contained state management */ - DWORD contained_render_states[WINEHIGHEST_RENDER_STATE + 1]; - unsigned int num_contained_render_states; - DWORD contained_transform_states[WINED3D_HIGHEST_TRANSFORM_STATE + 1]; - unsigned int num_contained_transform_states; - struct StageState contained_tss_states[WINED3D_MAX_TEXTURES * (WINED3D_HIGHEST_TEXTURE_STATE + 1)]; - unsigned int num_contained_tss_states; - struct StageState contained_sampler_states[WINED3D_MAX_COMBINED_SAMPLERS * WINED3D_HIGHEST_SAMPLER_STATE]; - unsigned int num_contained_sampler_states; -}; - bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const struct wined3d_d3d_info *d3d_info, struct wined3d_light_info *light_info, BOOL enable) DECLSPEC_HIDDEN; struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_light_state *state,

1 0