Skip to content

Commit d8e39dd

Browse files
committed
Align docu in 02_Combined_image_sampler.adoc and source in 26_texture_mapping.cpp
1 parent a3f5172 commit d8e39dd

3 files changed

Lines changed: 198 additions & 218 deletions

File tree

attachments/26_shader_textures.slang

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ ConstantBuffer<UniformBuffer> ubo;
1414
struct VSOutput
1515
{
1616
float4 pos : SV_Position;
17+
float3 fragColor;
1718
float2 fragTexCoord;
1819
};
1920

2021
[shader("vertex")]
2122
VSOutput vertMain(VSInput input) {
2223
VSOutput output;
2324
output.pos = mul(ubo.proj, mul(ubo.view, mul(ubo.model, float4(input.inPosition, 0.0, 1.0))));
25+
output.fragColor = input.inColor;
2426
output.fragTexCoord = input.inTexCoord;
2527
return output;
2628
}

0 commit comments

Comments
 (0)