From e57722d7f10533f0213642799e204d07a0c5f1c9 Mon Sep 17 00:00:00 2001 From: plapins Date: Wed, 21 Sep 2016 14:53:41 +0200 Subject: [PATCH] Added missing usages in buffers used a source of data copy. Fixed problems with types in starsphere.frag shader. Updated starsphere.frag.spv file. --- base/vulkanMeshLoader.hpp | 4 ++-- data/shaders/multithreading/starsphere.frag | 6 +++--- .../multithreading/starsphere.frag.spv | Bin 2920 -> 2888 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/vulkanMeshLoader.hpp b/base/vulkanMeshLoader.hpp index baca16be..7eb490fb 100644 --- a/base/vulkanMeshLoader.hpp +++ b/base/vulkanMeshLoader.hpp @@ -571,7 +571,7 @@ public: // Create device local target buffers // Vertex buffer vulkanDevice->createBuffer( - VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, + VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, meshBuffer->vertices.size, &meshBuffer->vertices.buf, @@ -579,7 +579,7 @@ public: // Index buffer vulkanDevice->createBuffer( - VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, + VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, meshBuffer->indices.size, &meshBuffer->indices.buf, diff --git a/data/shaders/multithreading/starsphere.frag b/data/shaders/multithreading/starsphere.frag index 07e35d3f..e0b3f64f 100644 --- a/data/shaders/multithreading/starsphere.frag +++ b/data/shaders/multithreading/starsphere.frag @@ -14,11 +14,11 @@ layout (location = 0) out vec4 outFragColor; float hash33(vec3 p3) { p3 = fract(p3 * HASHSCALE3); - p3 += dot(p3, p3.yxz+19.19); - return fract(vec3((p3.x + p3.y)*p3.z + (p3.x+p3.z)*p3.y + (p3.y+p3.z)*p3.x)); + p3 += dot(p3, p3.yxz+vec3(19.19)); + return fract((p3.x + p3.y)*p3.z + (p3.x+p3.z)*p3.y + (p3.y+p3.z)*p3.x); } -float starField(vec3 pos) +vec3 starField(vec3 pos) { vec3 color = vec3(0.0); float threshhold = (1.0 - STARFREQUENCY); diff --git a/data/shaders/multithreading/starsphere.frag.spv b/data/shaders/multithreading/starsphere.frag.spv index 9d590a2e29d72c8d90b1a758ea8529893594732a..7fbc1cc39937161731b7a9530ce720691fb8ef7e 100644 GIT binary patch literal 2888 zcmZ9NNpniNORg$`An+wP}+k9Z1r#yTK6wEvj6( zav`o<_#0fhaE%MMmi`GBPE}ey&&@s1a=T7_@B5zNJKu0`x3+BVNNE|r<>}M3^sG)T z@RT}Jdp3?wOiuLI8`J%RyLTGVom#U%WA0BKslcesmu44qT*N-cRuQMZ9Bbv*!uSJ8 zg|s4#PZUQ^y-=)|7fZELqgHY#{}^1e3p2&J(!$K;(oDHHxNGNP zY3fpHqf+y{Z77}0Q7P3c0|VQxTo^cj(wbJHEe<4bJN>3qZzgh&zJz?c&u#Yso$i4&5_M>H4AI=a%?LaE?6v zc>DIj;1}Ru-`Y47d}hf%6!TZ$<`}2XbD3py4X*7#&VA3+^k2$xtlKer8Phkzp7V!r zwE|}RM~t4iy7lDV9ko5&Q1{1JAGJSG+8B-X?7h>`i`@I$%)P(z5wh%U4zu4r>>xGl z#rH-1Gh*b`T(j>l(9B=N+z)*xh*EnOi?eYI-S^eA2{Fj>knhiXc@OOOLp|c(2V3Jt9`ga%ICX2dFKQ8g6|8nLU-KtmHJ{L~fz|9e zwClO%xtyR=&+P_gzVX*F*X^91qrQKrun+S*-QP~k$9H-!ah}^s%(Lxcj2>6#`ptYz z>)~p?w_W)eYyjJz`TCt#tR8h91giz#nDgWLxjY0{)2!v=`eH911smgc;LCgse%q|8 zFY0arJ5St$9HcvhB4ubF9gCR8a z=<^WRT=l3m47OK&-dp#01Y3q#Zy5WR8>bfUiQfR~jBns!u<>&5 z&-gw3XcPBcJJ!UFpUk;;(OP4e*g8kBxZf{Re9O;(jZu%B*TBs&ufxw` z>YwN9c>`>&zAkpxHNJ^?W_}CwpTk_M`=>AJzXeu{@4(w&wJ_s4;6=>+_MXVkV`|1* XSKoQ;FV-AucZ~cJ*ck7Q*t_!|+Uww7 literal 2920 zcmZ9NNpqA{6oxM(BtU|IOyWcUK?IDEFp3GpU;-Frh=7XPv`Lc=bkecAgCi28sB-1X zg}8FzZ*b|tH7?v*`X^jCRcZM=Uw=nhI(6#4?|X)O?)0T?@z&0i7V)<<-Ac{h>a-Z1 zQdjE8#?i6yvEF)PvUl&kJ|iATZCRi(D^q7`XVhkj)3Z9RVAru##Hlj@sEw*AeNR$* zT9!t~3PWdKDAY@H#agjZD%8ux$x^LQedkJPqEY{U46f6OS zpDUMYCG*>}J(`|9cm6`2(_p+eXM385->cb??PqnqF;Xi|Q8sIhzM6F&C)S_beGk5d z9e2++XS<&=ydKbv0L)!2`}{xTf=LHM?BfBuiJ zf&cd9Ps6*3w$5729OLvw-oxNcx9<$CqwZ#K59Uw5d`rffeQgCtui@X0wg?Np6YP4U z{)=FL(Z>i_EiB@WqkS`X{m5FfPk}@CY*Jb{68vJ54+ZBa(+_v=4g|jp|LV@h!QfL( z|6t5thMQxYKKFZ?(KWcX!#Vf;sOi6&;||8Cn?17h^-<67BXoVf1LHqt^eok_C-+XM z?dRsXKgRk~`vYYOqp_Z`cQtyEdoNqL_fkGYmc3Ol``wNWP{Uq)2kN(okymrgzCTAZ ze-3j$^qtP{$-Ce<8^_Rnhn_`PH=SCej=4{}FzcCb>>w+19s2Fb*lU=5>T?b9LwSGi zf&DJ1NBsL>YeWwpfQ<{gnXltRG=0Wf+x=3DI-h{m&g6650IT^6Z2_$2T0*;-Yo6C> zR^WMlikZKF>32Vz)AQB$Hx&+Ip0oSzx6q$&_yBR9=W@(5?`Di1SLOQcd`;`%YQEd< z{A|{P?azGu&MQ`rIvc=h!5_-`sre1&Q*j)9fbp&j$`r>XJ1*?a}Js(1gdv44>+)%aFcjdRjU+cSC0ry?4WQ=d=F|gkr zx%X=HK7OKw`!-LuaO1~w?j5z(2qw19aV+lrOJL{MXAOCL+s43Mn7V%FRExX!GFUD6 zD`4w?$6Y+dcp5WC{de-uGWz?AHR(HpskwG>)Oi)$TK62>y752ZJlGiZ$axLi8uL2* z0;c|1{x;qKo2##z-Sxe^iFsyzH}qe`T&w%1FY3PqR*O6EHdrmpxK4NhbHBYm@=KVS Z@z&LM3Hy^Z$J!kuzX&$QyCe4Q{0o(k<81%{