[PATCH 0/2] MR1730: Enable long types in wined3d/glsl_shader.c.
From: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 45 +++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 8 +++--- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e0e35b60d7c..9db92fdb9b2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -680,7 +680,7 @@ static void shader_glsl_init_uniform_block_bindings(const struct wined3d_gl_info /* Context activation is done by the caller. */ static void shader_glsl_load_samplers_range(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, GLuint program_id, const char *prefix, - unsigned int base, unsigned int count, const DWORD *tex_unit_map) + unsigned int base, unsigned int count, const unsigned int *tex_unit_map) { struct wined3d_string_buffer *sampler_name = string_buffer_get(&priv->string_buffers); unsigned int i, mapped_unit; @@ -2730,7 +2730,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* pixel shaders >= 3.0 */ if (version->major >= 3) { - DWORD idx = shader->u.ps.input_reg_map[reg->idx[0].offset]; + unsigned int idx = shader->u.ps.input_reg_map[reg->idx[0].offset]; unsigned int in_count = vec4_varyings(version->major, gl_info); if (reg->idx[0].rel_addr) @@ -3456,7 +3456,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (flags & WINED3D_GLSL_SAMPLE_LOAD) { - static const DWORD texel_fetch_flags = WINED3D_GLSL_SAMPLE_LOAD | WINED3D_GLSL_SAMPLE_OFFSET; + static const uint32_t texel_fetch_flags = WINED3D_GLSL_SAMPLE_LOAD | WINED3D_GLSL_SAMPLE_OFFSET; if (flags & ~texel_fetch_flags) ERR("Unexpected flags %#x for texelFetch.\n", flags & ~texel_fetch_flags); @@ -5142,7 +5142,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) ins->ctx->reg_maps->shader_version.minor); struct glsl_sample_function sample_function; DWORD sample_flags = 0; - DWORD resource_idx; + unsigned int resource_idx; DWORD mask = 0, swizzle; const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; enum wined3d_shader_resource_type resource_type; @@ -6260,7 +6260,7 @@ static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) else { enum wined3d_shader_src_modifier src_mod = ins->src[0].modifiers; - DWORD reg = ins->src[0].reg.idx[0].offset; + unsigned int reg = ins->src[0].reg.idx[0].offset; char dst_swizzle[6]; shader_glsl_get_swizzle(&ins->src[0], FALSE, write_mask, dst_swizzle); @@ -6291,7 +6291,7 @@ static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins) static void shader_glsl_texdp3tex(const struct wined3d_shader_instruction *ins) { DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; + unsigned int sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; struct glsl_src_param src0_param; UINT mask_size; @@ -6335,7 +6335,7 @@ static void shader_glsl_texdp3tex(const struct wined3d_shader_instruction *ins) static void shader_glsl_texdp3(const struct wined3d_shader_instruction *ins) { DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - DWORD dstreg = ins->dst[0].reg.idx[0].offset; + unsigned int dstreg = ins->dst[0].reg.idx[0].offset; struct glsl_src_param src0_param; DWORD dst_mask; unsigned int mask_size; @@ -6377,7 +6377,7 @@ static void shader_glsl_texdepth(const struct wined3d_shader_instruction *ins) static void shader_glsl_texm3x2depth(const struct wined3d_shader_instruction *ins) { DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - DWORD dstreg = ins->dst[0].reg.idx[0].offset; + unsigned int dstreg = ins->dst[0].reg.idx[0].offset; struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -6391,7 +6391,7 @@ static void shader_glsl_texm3x2depth(const struct wined3d_shader_instruction *in static void shader_glsl_texm3x2pad(const struct wined3d_shader_instruction *ins) { DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; - DWORD reg = ins->dst[0].reg.idx[0].offset; + unsigned int reg = ins->dst[0].reg.idx[0].offset; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; @@ -6406,7 +6406,7 @@ static void shader_glsl_texm3x3pad(const struct wined3d_shader_instruction *ins) DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; - DWORD reg = ins->dst[0].reg.idx[0].offset; + unsigned int reg = ins->dst[0].reg.idx[0].offset; struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -6419,7 +6419,7 @@ static void shader_glsl_texm3x2tex(const struct wined3d_shader_instruction *ins) DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct wined3d_string_buffer *buffer = ins->ctx->buffer; struct glsl_sample_function sample_function; - DWORD reg = ins->dst[0].reg.idx[0].offset; + unsigned int reg = ins->dst[0].reg.idx[0].offset; struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -6439,7 +6439,7 @@ static void shader_glsl_texm3x3tex(const struct wined3d_shader_instruction *ins) DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; struct glsl_sample_function sample_function; - DWORD reg = ins->dst[0].reg.idx[0].offset; + unsigned int reg = ins->dst[0].reg.idx[0].offset; struct glsl_src_param src0_param; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -6461,7 +6461,7 @@ static void shader_glsl_texm3x3(const struct wined3d_shader_instruction *ins) { DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; - DWORD reg = ins->dst[0].reg.idx[0].offset; + unsigned int reg = ins->dst[0].reg.idx[0].offset; struct glsl_src_param src0_param; char dst_mask[6]; @@ -6484,7 +6484,7 @@ static void shader_glsl_texm3x3spec(const struct wined3d_shader_instruction *ins struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct glsl_sample_function sample_function; - DWORD reg = ins->dst[0].reg.idx[0].offset; + unsigned int reg = ins->dst[0].reg.idx[0].offset; char coord_mask[6]; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -6515,7 +6515,7 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct glsl_sample_function sample_function; - DWORD reg = ins->dst[0].reg.idx[0].offset; + unsigned int reg = ins->dst[0].reg.idx[0].offset; struct glsl_src_param src0_param; char coord_mask[6]; @@ -6550,7 +6550,7 @@ static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins) const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct glsl_sample_function sample_function; struct glsl_src_param coord_param; - DWORD sampler_idx; + unsigned int sampler_idx; DWORD mask; DWORD flags; char coord_mask[6]; @@ -6614,7 +6614,7 @@ static void shader_glsl_texbem(const struct wined3d_shader_instruction *ins) static void shader_glsl_bem(const struct wined3d_shader_instruction *ins) { - DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; + unsigned int sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_src_param src0_param, src1_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1, &src0_param); @@ -6891,7 +6891,7 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struc } static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, - const struct wined3d_gl_info *gl_info, const DWORD *map, + const struct wined3d_gl_info *gl_info, const unsigned int *map, const struct wined3d_shader_signature *input_signature, const struct wined3d_shader_reg_maps *reg_maps_in, const struct wined3d_shader_signature *output_signature, @@ -6902,7 +6902,8 @@ static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, struct wined3d_string_buffer *buffer = &priv->shader_buffer; unsigned int in_count = vec4_varyings(3, gl_info); unsigned int max_varyings = needs_legacy_glsl_syntax(gl_info) ? in_count + 2 : in_count; - DWORD in_idx, *set = NULL; + unsigned int in_idx; + DWORD *set = NULL; unsigned int i, j; char reg_mask[6]; @@ -7047,7 +7048,7 @@ static void shader_glsl_generate_clip_or_cull_distances(struct wined3d_string_bu } static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv, - const struct wined3d_gl_info *gl_info, const DWORD *map, + const struct wined3d_gl_info *gl_info, const unsigned int *map, const struct wined3d_shader_signature *input_signature, const struct wined3d_shader_reg_maps *reg_maps_in, unsigned int input_count, const struct wined3d_shader_signature *output_signature, @@ -9251,7 +9252,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr } static const char *shader_glsl_get_ffp_fragment_op_arg(struct wined3d_string_buffer *buffer, - DWORD argnum, unsigned int stage, DWORD arg) + unsigned int argnum, unsigned int stage, DWORD arg) { const char *ret; @@ -9344,7 +9345,7 @@ static const char *shader_glsl_get_ffp_fragment_op_arg(struct wined3d_string_buf } static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, unsigned int stage, BOOL color, - BOOL alpha, BOOL tmp_dst, DWORD op, DWORD dw_arg0, DWORD dw_arg1, DWORD dw_arg2) + BOOL alpha, BOOL tmp_dst, unsigned int op, DWORD dw_arg0, DWORD dw_arg1, DWORD dw_arg2) { const char *dstmask, *dstreg, *arg0, *arg1, *arg2; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 12dc08da352..f291201fa31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1224,7 +1224,7 @@ struct wined3d_shader_reg_maps struct wined3d_shader_tex_mx { unsigned int current_row; - DWORD texcoord_w[2]; + unsigned int texcoord_w[2]; }; struct wined3d_shader_parser_state @@ -1258,7 +1258,7 @@ struct wined3d_shader_register enum wined3d_immconst_type immconst_type; union { - DWORD immconst_data[4]; + unsigned int immconst_data[4]; unsigned fp_body_idx; } u; }; @@ -3775,7 +3775,7 @@ struct wined3d_ffp_vs_settings DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ - DWORD texgen[WINED3D_MAX_TEXTURES]; + unsigned int texgen[WINED3D_MAX_TEXTURES]; }; struct wined3d_ffp_vs_desc @@ -5931,7 +5931,7 @@ struct wined3d_geometry_shader struct wined3d_pixel_shader { /* Pixel shader input semantics */ - DWORD input_reg_map[MAX_REG_INPUT]; + unsigned int input_reg_map[MAX_REG_INPUT]; DWORD input_reg_used; /* MAX_REG_INPUT, 32 */ unsigned int declared_in_count; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1730
From: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9db92fdb9b2..188080967e5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -20,7 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_NO_LONG_TYPES /* temporary */ /* * D3D shader asm has swizzles on source parameters, and write masks for @@ -13158,7 +13157,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli if (FAILED(hr = wined3d_texture_create(device, &desc, 1, 1, 0, NULL, NULL, &wined3d_null_parent_ops, &staging_texture))) { - ERR("Failed to create staging texture, hr %#x.\n", hr); + ERR("Failed to create staging texture, hr %#lx.\n", hr); return dst_location; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1730
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1730
participants (3)
-
Eric Pouech -
eric pouech (＠epo)
-
Zebediah Figura (＠zfigura)