- Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Avoid uploading deferred context maps more than once.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 2f84616e02e876d71d3871dd17ef3d9db6c043bb URL: https://gitlab.winehq.org/wine/wine/-/commit/2f84616e02e876d71d3871dd17ef3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 18:46:05 2023 -0500 wined3d: Avoid uploading deferred context maps more than once. --- dlls/wined3d/cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 029ca5d884d..5fc2bf64074 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -4211,7 +4211,7 @@ static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_conte struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_box *box, struct upload_bo *bo) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - const struct wined3d_deferred_upload *upload; + struct wined3d_deferred_upload *upload; if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) { @@ -4219,6 +4219,7 @@ static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_conte bo->addr.buffer_object = 0; bo->addr.addr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); bo->flags = upload->upload_flags; + upload->upload_flags = 0; return true; }

1 0

Zebediah Figura : wined3d: Move more miscellaneous GL declarations to wined3d_gl.h.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 34245154e8879cbebbed892d72ff2728a8fe8684 URL: https://gitlab.winehq.org/wine/wine/-/commit/34245154e8879cbebbed892d72ff27… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:38:09 2023 -0600 wined3d: Move more miscellaneous GL declarations to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 25 +++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a4b8e378f67..f4130c72d30 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -366,6 +366,31 @@ GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *g void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, const char *file, unsigned int line, const char *name); +struct min_lookup +{ + GLenum mip[WINED3D_TEXF_LINEAR + 1]; +}; + +extern const struct min_lookup minMipLookup[WINED3D_TEXF_LINEAR + 1]; +extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1]; + +static inline GLenum wined3d_gl_mag_filter(enum wined3d_texture_filter_type mag_filter) +{ + return magLookup[mag_filter]; +} + +static inline GLenum wined3d_gl_min_mip_filter(enum wined3d_texture_filter_type min_filter, + enum wined3d_texture_filter_type mip_filter) +{ + return minMipLookup[min_filter].mip[mip_filter]; +} + +GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f); + +const char *debug_fboattachment(GLenum attachment); +const char *debug_fbostatus(GLenum status); +const char *debug_glerror(GLenum error); + static inline bool wined3d_fence_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b568fa9d61..c2c3e4720b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -297,19 +297,9 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 -struct min_lookup -{ - GLenum mip[WINED3D_TEXF_LINEAR + 1]; -}; - -extern const struct min_lookup minMipLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; -extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; - static const uint32_t WINED3D_READ_ONLY_BIND_MASK = WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER | WINED3D_BIND_CONSTANT_BUFFER | WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_INDIRECT_BUFFER; -GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; - static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) { if (func < WINED3D_CMP_NEVER || func > WINED3D_CMP_ALWAYS) @@ -317,17 +307,6 @@ static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_f return func; } -static inline GLenum wined3d_gl_mag_filter(enum wined3d_texture_filter_type mag_filter) -{ - return magLookup[mag_filter]; -} - -static inline GLenum wined3d_gl_min_mip_filter(enum wined3d_texture_filter_type min_filter, - enum wined3d_texture_filter_type mip_filter) -{ - return minMipLookup[min_filter].mip[mip_filter]; -} - /* float_16_to_32() and float_32_to_16() convert 16 bit floats in the * FLOAT16 data type to standard C floats and vice versa. They do not * depend on the encoding of the C float, so they are platform independent, @@ -4856,9 +4835,6 @@ const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_t const char *debug_d3dtexturestate(enum wined3d_texture_stage_state state) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN; const char *debug_d3dtstype(enum wined3d_transform_state tstype) DECLSPEC_HIDDEN; -const char *debug_fboattachment(GLenum attachment) DECLSPEC_HIDDEN; -const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; -const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; const char *debug_ivec4(const struct wined3d_ivec4 *v) DECLSPEC_HIDDEN; const char *debug_uvec4(const struct wined3d_uvec4 *v) DECLSPEC_HIDDEN; const char *debug_shader_type(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Move the ffp_attrib_ops to wined3d_gl_info.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: dcdba8d571bde0984623e3664f925612f3b8909a URL: https://gitlab.winehq.org/wine/wine/-/commit/dcdba8d571bde0984623e3664f9256… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:32:18 2023 -0600 wined3d: Move the ffp_attrib_ops to wined3d_gl_info. They are quite GL-specific. --- dlls/wined3d/adapter_gl.c | 6 +++--- dlls/wined3d/context_gl.c | 6 ++++-- dlls/wined3d/wined3d_gl.h | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 18 ++---------------- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f1216ddd89b..5fda5391233 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4018,9 +4018,9 @@ static void WINE_GLAPI generic_float16_4(GLuint idx, const void *data) static void wined3d_adapter_init_ffp_attrib_ops(struct wined3d_adapter_gl *adapter_gl) { - const struct wined3d_gl_info *gl_info = &adapter_gl->gl_info; - struct wined3d_d3d_info *d3d_info = &adapter_gl->a.d3d_info; - struct wined3d_ffp_attrib_ops *ops = &d3d_info->ffp_attrib_ops; + const struct wined3d_d3d_info *d3d_info = &adapter_gl->a.d3d_info; + struct wined3d_gl_info *gl_info = &adapter_gl->gl_info; + struct wined3d_ffp_attrib_ops *ops = &gl_info->ffp_attrib_ops; unsigned int i; for (i = 0; i < WINED3D_FFP_EMIT_COUNT; ++i) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c2ebca8e99f..c1a6538d6ff 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4666,16 +4666,18 @@ static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl * const struct wined3d_state *state, const void *idx_data, unsigned int idx_size, int base_vertex_idx, unsigned int start_idx, unsigned int count, unsigned int start_instance, unsigned int instance_count) { - const struct wined3d_ffp_attrib_ops *ops = &context_gl->c.d3d_info->ffp_attrib_ops; GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; const struct wined3d_stream_info *si = &context_gl->c.stream_info; GLenum mode = gl_primitive_type_from_d3d(state->primitive_type); const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int instanced_elements[ARRAY_SIZE(si->elements)]; + const struct wined3d_ffp_attrib_ops *ops; unsigned int instanced_element_count = 0; const void *indices; unsigned int i, j; + ops = &gl_info->ffp_attrib_ops; + indices = (const char *)idx_data + idx_size * start_idx; if (!instance_count) @@ -4840,7 +4842,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, if (idx_size) idx_data = (uint8_t *)wined3d_buffer_load_sysmem(state->index_buffer, &context_gl->c) + state->index_offset; - ops = &d3d_info->ffp_attrib_ops; + ops = &gl_info->ffp_attrib_ops; gl_info->gl_ops.gl.p_glBegin(gl_primitive_type_from_d3d(state->primitive_type)); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 33f51944977..a4b8e378f67 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -325,6 +325,20 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g #define WINED3D_QUIRK_BROKEN_ARB_FOG 0x00000200 #define WINED3D_QUIRK_NO_INDEPENDENT_BIT_DEPTHS 0x00000400 +typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); +typedef void (WINE_GLAPI *wined3d_ffp_texcoord_func)(GLenum unit, const void *data); +typedef void (WINE_GLAPI *wined3d_generic_attrib_func)(GLuint idx, const void *data); + +struct wined3d_ffp_attrib_ops +{ + wined3d_ffp_attrib_func position[WINED3D_FFP_EMIT_COUNT]; + wined3d_ffp_attrib_func diffuse[WINED3D_FFP_EMIT_COUNT]; + wined3d_ffp_attrib_func specular[WINED3D_FFP_EMIT_COUNT]; + wined3d_ffp_attrib_func normal[WINED3D_FFP_EMIT_COUNT]; + wined3d_ffp_texcoord_func texcoord[WINED3D_FFP_EMIT_COUNT]; + wined3d_generic_attrib_func generic[WINED3D_FFP_EMIT_COUNT]; +}; + struct wined3d_gl_info { unsigned int selected_gl_version; @@ -337,6 +351,7 @@ struct wined3d_gl_info float filling_convention_offset; HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); + struct wined3d_ffp_attrib_ops ffp_attrib_ops; struct opengl_funcs gl_ops; struct wined3d_fbo_ops fbo_ops; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 656df92018f..2b568fa9d61 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -49,7 +49,6 @@ #include "objbase.h" #include "wine/wined3d.h" -#include "wined3d_gl.h" #include "wine/list.h" #include "wine/rbtree.h" @@ -145,6 +144,8 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_COUNT, }; +#include "wined3d_gl.h" + /* Texture format fixups */ enum fixup_channel_source @@ -202,24 +203,9 @@ struct wined3d_d3d_limits float pointsize_max; }; -typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); -typedef void (WINE_GLAPI *wined3d_ffp_texcoord_func)(GLenum unit, const void *data); -typedef void (WINE_GLAPI *wined3d_generic_attrib_func)(GLuint idx, const void *data); - -struct wined3d_ffp_attrib_ops -{ - wined3d_ffp_attrib_func position[WINED3D_FFP_EMIT_COUNT]; - wined3d_ffp_attrib_func diffuse[WINED3D_FFP_EMIT_COUNT]; - wined3d_ffp_attrib_func specular[WINED3D_FFP_EMIT_COUNT]; - wined3d_ffp_attrib_func normal[WINED3D_FFP_EMIT_COUNT]; - wined3d_ffp_texcoord_func texcoord[WINED3D_FFP_EMIT_COUNT]; - wined3d_generic_attrib_func generic[WINED3D_FFP_EMIT_COUNT]; -}; - struct wined3d_d3d_info { struct wined3d_d3d_limits limits; - struct wined3d_ffp_attrib_ops ffp_attrib_ops; uint32_t wined3d_creation_flags; uint32_t xyzrhw : 1; uint32_t emulated_flatshading : 1;

1 0

Zebediah Figura : wined3d: Remove the no longer used "specular_func_3ubv" declaration.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 77e282d7a161b9d39df7b40d7e16e89f4c5ecfaa URL: https://gitlab.winehq.org/wine/wine/-/commit/77e282d7a161b9d39df7b40d7e16e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:21:22 2023 -0600 wined3d: Remove the no longer used "specular_func_3ubv" declaration. --- dlls/wined3d/wined3d_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b20bc77185..656df92018f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,7 +205,6 @@ struct wined3d_d3d_limits typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); typedef void (WINE_GLAPI *wined3d_ffp_texcoord_func)(GLenum unit, const void *data); typedef void (WINE_GLAPI *wined3d_generic_attrib_func)(GLuint idx, const void *data); -extern wined3d_ffp_attrib_func specular_func_3ubv DECLSPEC_HIDDEN; struct wined3d_ffp_attrib_ops {

1 0

Zebediah Figura : wined3d: Move some wined3d_gl_info functions to wined3d_gl.h.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 421f70710a0e2371350f5ed2cdb0fbb7c3ffab83 URL: https://gitlab.winehq.org/wine/wine/-/commit/421f70710a0e2371350f5ed2cdb0fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 13:28:07 2022 -0600 wined3d: Move some wined3d_gl_info functions to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 33 --------------------------------- 2 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index e9e422a1ab4..33f51944977 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -26,6 +26,7 @@ #define WINE_GLAPI __stdcall +#include <stdbool.h> #include <stdint.h> #include "wine/wgl.h" @@ -308,6 +309,11 @@ struct wined3d_gl_limits unsigned int arb_ps_temps; }; +void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count); +void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count); + #define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001 #define WINED3D_QUIRK_GLSL_CLIP_VARYING 0x00000004 #define WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA 0x00000008 @@ -338,4 +344,30 @@ struct wined3d_gl_info void (WINE_GLAPI *p_glEnableWINE)(GLenum cap); }; +void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext); +void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL program); +void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint program); +GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags); +void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, + const char *file, unsigned int line, const char *name); + +static inline bool wined3d_fence_supported(const struct wined3d_gl_info *gl_info) +{ + return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; +} + +/* Checking of API calls */ +/* --------------------- */ +#ifndef WINE_NO_DEBUG_MSGS +#define checkGLcall(A) \ + do \ + { \ + if (__WINE_IS_DEBUG_ON(_ERR, &__wine_dbch_d3d) \ + && !gl_info->supported[ARB_DEBUG_OUTPUT]) \ + wined3d_check_gl_call(gl_info, __FILE__, __LINE__, A); \ + } while(0) +#else +#define checkGLcall(A) do {} while(0) +#endif + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d81f6c3c0d..1b20bc77185 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1637,22 +1637,6 @@ static inline void wined3d_colour_srgb_from_linear(struct wined3d_color *colour_ colour_srgb->a = colour->a; } -void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, - const char *file, unsigned int line, const char *name) DECLSPEC_HIDDEN; - -/* Checking of API calls */ -/* --------------------- */ -#ifndef WINE_NO_DEBUG_MSGS -#define checkGLcall(A) \ -do { \ - if (__WINE_IS_DEBUG_ON(_ERR, &__wine_dbch_d3d) \ - && !gl_info->supported[ARB_DEBUG_OUTPUT]) \ - wined3d_check_gl_call(gl_info, __FILE__, __LINE__, A); \ -} while(0) -#else -#define checkGLcall(A) do {} while(0) -#endif - struct wined3d_bo { /* client_map_count and map_ptr are accessed from both the client and CS @@ -2866,16 +2850,6 @@ enum wined3d_pci_device CARD_INTEL_UHD630_2 = 0x3e91, }; -void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, - enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; -void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, - enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; - -static inline BOOL wined3d_fence_supported(const struct wined3d_gl_info *gl_info) -{ - return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; -} - /* The driver names reflect the lowest GPU supported * by a certain driver, so DRIVER_AMD_R300 supports * R3xx, R4xx and R5xx GPUs. */ @@ -3125,8 +3099,6 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECL BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; bool wined3d_caps_gl_ctx_test_filling_convention(struct wined3d_caps_gl_ctx *ctx, float offset) DECLSPEC_HIDDEN; -void install_gl_compat_wrapper(struct wined3d_gl_info *gl_info, enum wined3d_gl_extension ext) DECLSPEC_HIDDEN; - enum wined3d_projection_type { WINED3D_PROJECTION_NONE = 0, @@ -4650,8 +4622,6 @@ static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const stru return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); } -GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, - uint32_t bind_flags) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; @@ -5273,9 +5243,6 @@ struct ps_np2fixup_info { WORD num_consts; }; -void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL program) DECLSPEC_HIDDEN; -void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint program) DECLSPEC_HIDDEN; - struct wined3d_palette { LONG ref;

1 0

Zebediah Figura : wined3d: Move struct wined3d_gl_info to wined3d_gl.h.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: bafb02efbec519fc3430e9bf478c2e1e845740d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bafb02efbec519fc3430e9bf478c2e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 22 13:18:09 2022 -0600 wined3d: Move struct wined3d_gl_info to wined3d_gl.h. And its dependencies. --- dlls/wined3d/wined3d_gl.h | 111 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 109 ---------------------------------------- 2 files changed, 111 insertions(+), 109 deletions(-)

1 0

Conor McCarthy : vkd3d: Implement ID3D12Fence1.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: vkd3d Branch: master Commit: c2e09e4c4f4070e9c2de440ff01280c2f5ecbd43 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2e09e4c4f4070e9c2de440ff0128… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 7 23:30:35 2023 +1000 vkd3d: Implement ID3D12Fence1. --- include/vkd3d_d3d12.idl | 11 +++++++ libs/vkd3d/command.c | 76 +++++++++++++++++++++++++++------------------- libs/vkd3d/device.c | 2 +- libs/vkd3d/vkd3d_private.h | 4 ++- 4 files changed, 60 insertions(+), 33 deletions(-)

1 0

Petrichor Park : wined3d: Use ffp_normalize in shader_glsl_ffp_vertex_lighting_footer.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 17d64ac1e0229a0957427e67e5571c92f58aa226 URL: https://gitlab.winehq.org/wine/wine/-/commit/17d64ac1e0229a0957427e67e5571c… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Thu Jul 20 09:48:49 2023 -0500 wined3d: Use ffp_normalize in shader_glsl_ffp_vertex_lighting_footer. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c137875821f..8b3a25e276b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8854,9 +8854,9 @@ static void shader_glsl_ffp_vertex_lighting_footer(struct wined3d_string_buffer shader_addline(buffer, "diffuse += clamp(dot(dir, normal), 0.0, 1.0)" " * ffp_light[%u].diffuse.xyz * att;\n", idx); if (settings->localviewer) - shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); + shader_addline(buffer, "t = dot(normal, ffp_normalize(dir - ffp_normalize(ec_pos.xyz)));\n"); else - shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); + shader_addline(buffer, "t = dot(normal, ffp_normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); shader_addline(buffer, "if (dot(dir, normal) > 0.0 && t > 0.0%s) specular +=" " pow(t, ffp_material.shininess) * ffp_light[%u].specular * att;\n", legacy_lighting ? " && ffp_material.shininess > 0.0" : "", idx);

1 0

Petrichor Park : wined3d: Use ffp_normalize in shader_glsl_ffp_vertex_lighting.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 79b92a6d391cc1dda7bb5bd5e1b7889d5a0b0c91 URL: https://gitlab.winehq.org/wine/wine/-/commit/79b92a6d391cc1dda7bb5bd5e1b788… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Thu Jul 20 09:48:44 2023 -0500 wined3d: Use ffp_normalize in shader_glsl_ffp_vertex_lighting. --- dlls/wined3d/glsl_shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bbfea62f56a..c137875821f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8913,7 +8913,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "}\n"); continue; } - shader_addline(buffer, "dir = normalize(dir);\n"); + shader_addline(buffer, "dir = ffp_normalize(dir);\n"); shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx, legacy_lighting); shader_addline(buffer, "}\n"); } @@ -8934,8 +8934,8 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer { shader_addline(buffer, "if (dst.y <= ffp_light[%u].range)\n{\n", idx); } - shader_addline(buffer, "dir = normalize(dir);\n"); - shader_addline(buffer, "t = dot(-dir, normalize(ffp_light[%u].direction));\n", idx); + shader_addline(buffer, "dir = ffp_normalize(dir);\n"); + shader_addline(buffer, "t = dot(-dir, ffp_normalize(ffp_light[%u].direction));\n", idx); shader_addline(buffer, "if (t > ffp_light[%u].cos_htheta) att = 1.0;\n", idx); shader_addline(buffer, "else if (t <= ffp_light[%u].cos_hphi) att = 0.0;\n", idx); shader_addline(buffer, "else att = pow((t - ffp_light[%u].cos_hphi)" @@ -8965,7 +8965,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer if (!settings->normal) continue; shader_addline(buffer, "att = 1.0;\n"); - shader_addline(buffer, "dir = normalize(ffp_light[%u].direction.xyz);\n", idx); + shader_addline(buffer, "dir = ffp_normalize(ffp_light[%u].direction.xyz);\n", idx); shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx, legacy_lighting); } @@ -8975,7 +8975,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer if (!settings->normal) continue; shader_addline(buffer, "att = 1.0;\n"); - shader_addline(buffer, "dir = normalize(ffp_light[%u].position.xyz);\n", idx); + shader_addline(buffer, "dir = ffp_normalize(ffp_light[%u].position.xyz);\n", idx); shader_glsl_ffp_vertex_lighting_footer(buffer, settings, idx, legacy_lighting); }

1 0

Gabriel Ivăncescu : jscript: Use the object containing the prop for builtin getters.
by Alexandre Julliard Aug. 1, 2023

Aug. 1, 2023

Module: wine Branch: master Commit: 954dd16fb146250b08940aaf103864399214fed4 URL: https://gitlab.winehq.org/wine/wine/-/commit/954dd16fb146250b08940aaf103864… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 31 18:50:59 2023 +0300 jscript: Use the object containing the prop for builtin getters. Since they act like values. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 2 +- dlls/mshtml/tests/es5.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 0dd575434c1..ef72860f627 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -454,7 +454,7 @@ static HRESULT prop_get(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t *prop, switch(prop->type) { case PROP_BUILTIN: - hres = prop->u.p->getter(This->ctx, This, r); + hres = prop->u.p->getter(This->ctx, prop_obj, r); break; case PROP_JSVAL: hres = jsval_copy(prop->u.val, r); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index cef3c77c207..38a70740698 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1720,6 +1720,9 @@ sync_test("builtin_context", function() { ok(obj === window, "obj = " + obj); obj = (function() { return this; }).call(42); ok(obj.valueOf() === 42, "obj = " + obj); + + obj = Object.create([100]); + ok(obj.length === 1, "obj.length = " + obj.length); }); sync_test("host this", function() {

1 0