From 310a9ec6f962172afb586e7d99e20ddff4530ad4 Mon Sep 17 00:00:00 2001 From: arufus Date: Thu, 11 Aug 2022 17:26:26 +0800 Subject: [PATCH] Fix hlsl pixel shader in multisampling demo --- data/shaders/hlsl/multisampling/mesh.frag | 6 +++--- data/shaders/hlsl/multisampling/mesh.frag.spv | Bin 2784 -> 1792 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/shaders/hlsl/multisampling/mesh.frag b/data/shaders/hlsl/multisampling/mesh.frag index 2bc0a9c2..273dde58 100644 --- a/data/shaders/hlsl/multisampling/mesh.frag +++ b/data/shaders/hlsl/multisampling/mesh.frag @@ -1,7 +1,7 @@ // Copyright 2020 Google LLC -Texture2D textureColorMap : register(t1); -SamplerState samplerColorMap : register(s1); +Texture2D textureColorMap : register(t0, space1); +SamplerState samplerColorMap : register(s0, space1); struct VSOutput { @@ -20,7 +20,7 @@ float4 main(VSOutput input) : SV_TARGET float3 L = normalize(input.LightVec); float3 V = normalize(input.ViewVec); float3 R = reflect(-L, N); - float3 diffuse = max(dot(N, L), 0.0) * input.Color; + float3 diffuse = max(dot(N, L), 0.15) * input.Color; float3 specular = pow(max(dot(R, V), 0.0), 16.0) * float3(0.75, 0.75, 0.75); return float4(diffuse * color.rgb + specular, 1.0); } \ No newline at end of file diff --git a/data/shaders/hlsl/multisampling/mesh.frag.spv b/data/shaders/hlsl/multisampling/mesh.frag.spv index b7626a88c842bf480b89b4e4b2f1d43de5d378c1..d52870a3107e1c38786ad26aacfc6f75263ff7bb 100644 GIT binary patch literal 1792 zcmZ9M%TH556vl^^;-j^IC|K~(if{0$6%a*eo7!|!yjmJ`XPVHMCX_a%7+qNxZe6+2 zztoM1-*33b6vlkceBU{9UUy17ws^+5G3Q*`mGnPr+Qqz*bQ6BB)^=*a;b1RVS$&K> z?c!|SHtCXXT<4h3X|@m0v7#k}2|)?mSz$^R{NQo@!#h#2VZ)vAio#1JI#+R zarE=(tjS?UXHVHfGR08u%i1c0V*q^=hTz z?~R|BA2}{a_wzVz=KoNts+eA`3oJN2!1;=BYKJpxIQ7E02d73j_u$k8XTh2IO~K;9 za{>!HGaj|W%|5FvY4NPEBwx;xf^)-y@hP$2zcO3Kr@g&cn3MlSow-A;%c>kcBj97O zdzYlKj9>O_Sjy-%@t%l756r<9oRw9s+2f=4otGDH3Vklpjb9Px9<@+oMmw>Ii~qcK z?C97Rv}0$!*sp4*AM_dBx~4rRg_(0+(3$T|%^UKkE@sYxQx7v{!KsIMTsZPyTptC#5>z zc>%wwfQ>vqqyC;o-2CZzMZll>u=D%+A%9}63ONBEi?OCNIjD!6#CRrH4D9^2%(foc zcvtxGJG1!Db>{bpPpDT!&KCmn0xaS(XJ(0gL!d7FzD3&0NGG0sw@sbVS*C62j7Ch; c3XwMYEsN5)k3V+4<(6J8@4P7dRfKinA7b`&WdHyG literal 2784 zcmZ9N>2s4+6o=ogqOC29P$`OU#2t*vpyP~#v{O6%5(u_6`pt=w!OV1tX(Hf8QE?YH za9?ouPxOm3KF{SnHsms=_xyfmx#ygF-!L?I;D#(4$g*rA`%8eYQuSQk=c@*$#)z z8LW3ZsfeZ8^UJe~3-ik#*Y@9`ib@SYJFvk^Y&7+$!|Et zI_GCu zT_61qF&Xh5M4ym|n}VZ`*}Y7}@5MNKvX59|S5EF*uc^s*8ZW;Y`RRfWd>hy}&$cFK zZ*KGIe>=N&dF?s7c6-)-2fOv>$S$Hv>?IiQM14Ou?0Yu9VxG{AzYFXe(5D1`h&@N- zwfg~S&kKB{z~<0?w7}-w$GJ1?&gThi&cOHM65G4)!zH$NYai&r_7&LPeZPVA_x<)_ zYYXfwe81*=jK~su+>i742Xuhlv+ZjQFwUP@hhOf)?LNHGhdVvk^SV9Q`TD(k z{!z|%p7$cw9{4_V=OK2!_an|D><^$jkH81f&3BS1c%O$5bDGCk{q=d0Q#@O{vEJ7i z#JdvvHqRp7)hs7^$LA1Z{C4%Ro>vk18a^}ZuOa3!_E{>+*vxgS-*jp&u>5K zf3x79#>Y2)9+7hew}~$2od^8n z^Xx<-&qwI;k>_Ld$fM0XzE}B(`2^kE=ea-M+a*LU?4P3B!#Fe4{uyG<1w>!%=Jnlc zi~2rCx4z!H`~oZ=xxYj=ci_wD)^fSH>nrH`$a}u`{}tl-zF+PBmS4i(+P+3SLmzAM z+mnm@-=JG(;BV2LN1XQ^x<2x8-uLKno_5a*+Yg0pnq9vsBx?B)-TycAu@=93xj6eL zbn6r6>^~#ExhmhOy~p9SZc@%{XTZoK~5ClPz=vTKW89z>VZwvAo