wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Implement texCUBEbias().

Browse Source
This commit is contained in:
Shaun Ren
2025-08-24 19:02:25 -04:00
committed by Henri Verbeet
parent b9545f7422
commit 1083b31dfd
Notes: Henri Verbeet 2025-09-03 13:09:54 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1698
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/vkd3d-shader/hlsl.y
View File

@@ -4748,7 +4748,8 @@ static bool intrinsic_tex(struct hlsl_ctx *ctx, const struct parse_initializer *
} }
if (!strcmp(name, "tex2Dbias") if (!strcmp(name, "tex2Dbias")
|| !strcmp(name, "tex2Dlod")) || !strcmp(name, "tex2Dlod")
|| !strcmp(name, "texCUBEbias"))
{ {
struct hlsl_ir_node *lod, *c; struct hlsl_ir_node *lod, *c;
@@ -4900,6 +4901,12 @@ static bool intrinsic_texCUBE(struct hlsl_ctx *ctx,
return intrinsic_tex(ctx, params, loc, "texCUBE", HLSL_SAMPLER_DIM_CUBE); return intrinsic_tex(ctx, params, loc, "texCUBE", HLSL_SAMPLER_DIM_CUBE);
} }
static bool intrinsic_texCUBEbias(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{
return intrinsic_tex(ctx, params, loc, "texCUBEbias", HLSL_SAMPLER_DIM_CUBE);
}
static bool intrinsic_texCUBEgrad(struct hlsl_ctx *ctx, static bool intrinsic_texCUBEgrad(struct hlsl_ctx *ctx,
const struct parse_initializer *params, const struct vkd3d_shader_location *loc) const struct parse_initializer *params, const struct vkd3d_shader_location *loc)
{ {
@@ -5375,6 +5382,7 @@ intrinsic_functions[] =
{"tex3Dgrad", 4, false, intrinsic_tex3Dgrad}, {"tex3Dgrad", 4, false, intrinsic_tex3Dgrad},
{"tex3Dproj", 2, false, intrinsic_tex3Dproj}, {"tex3Dproj", 2, false, intrinsic_tex3Dproj},
{"texCUBE", -1, false, intrinsic_texCUBE}, {"texCUBE", -1, false, intrinsic_texCUBE},
{"texCUBEbias", 2, false, intrinsic_texCUBEbias},
{"texCUBEgrad", 4, false, intrinsic_texCUBEgrad}, {"texCUBEgrad", 4, false, intrinsic_texCUBEgrad},
{"texCUBEproj", 2, false, intrinsic_texCUBEproj}, {"texCUBEproj", 2, false, intrinsic_texCUBEproj},
{"transpose", 1, true, intrinsic_transpose}, {"transpose", 1, true, intrinsic_transpose},

8
tests/hlsl/sample-bias.shader_test
View File

@@ -121,7 +121,7 @@ probe (0, 0) f32(0.0, 0.0, 10.0, 0.0)
shader model >= 3.0 shader model >= 3.0
options: backcompat options: backcompat
[pixel shader fail(sm>=5.1) todo(sm<5.1)] [pixel shader fail(sm>=5.1) todo(sm>=5.1)]
sampler s; sampler s;
float bias; float bias;
@@ -134,13 +134,13 @@ float4 main(float2 coord : texcoord) : sv_target
[test] [test]
uniform 0 float 7.9 uniform 0 float 7.9
todo draw quad draw quad
probe (0, 0) f32(10.0, 0.0, 10.0, 0.0) probe (0, 0) f32(10.0, 0.0, 10.0, 0.0)
uniform 0 float 8.4 uniform 0 float 8.4
todo draw quad draw quad
probe (0, 0) f32(4.0, 0.0, 10.0, 0.0) probe (0, 0) f32(4.0, 0.0, 10.0, 0.0)
uniform 0 float 8.9 uniform 0 float 8.9
todo draw quad draw quad
probe (0, 0) f32(0.0, 0.0, 10.0, 0.0) probe (0, 0) f32(0.0, 0.0, 10.0, 0.0)