[PATCH 2/7] wined3d: Implement SM4 sample_l instruction. (resend)
Józef Kucia
jkucia at codeweavers.com
Mon Jan 4 06:03:37 CST 2016
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 366c6ec..818d558 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -4244,6 +4244,23 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins)
shader_glsl_release_sample_function(ins->ctx, &sample_function);
}
+static void shader_glsl_sample_lod(const struct wined3d_shader_instruction *ins)
+{
+ struct glsl_src_param coord_param, lod_param;
+ struct glsl_sample_function sample_function;
+ unsigned int sampler_idx;
+
+ shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset,
+ WINED3D_GLSL_SAMPLE_LOD, &sample_function);
+ shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param);
+ shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param);
+ sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map,
+ ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset);
+ shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE,
+ NULL, NULL, lod_param.param_str, "%s", coord_param.param_str);
+ shader_glsl_release_sample_function(ins->ctx, &sample_function);
+}
+
static void shader_glsl_texcoord(const struct wined3d_shader_instruction *ins)
{
/* FIXME: Make this work for more than just 2D textures */
@@ -7895,7 +7912,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_RSQ */ shader_glsl_scalar_op,
/* WINED3DSIH_SAMPLE */ shader_glsl_sample,
/* WINED3DSIH_SAMPLE_GRAD */ NULL,
- /* WINED3DSIH_SAMPLE_LOD */ NULL,
+ /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample_lod,
/* WINED3DSIH_SETP */ NULL,
/* WINED3DSIH_SGE */ shader_glsl_compare,
/* WINED3DSIH_SGN */ shader_glsl_sgn,
--
2.4.10
More information about the wine-patches
mailing list