Sfoglia il codice sorgente

Fix optimization examples;

bjorn 1 anno fa
parent
commit
f2faaa77d4

+ 2 - 2
examples/Optimization/Instancing_-_Blob/main.lua

@@ -22,7 +22,7 @@ function lovr.load()
   end
 
   -- Create a Buffer to store positions for lots of models
-  buffer = lovr.graphics.newBuffer(transformBlob, 'mat4')
+  buffer = lovr.graphics.newBuffer('mat4', transformBlob)
 
   shader = lovr.graphics.newShader([[
     layout(set = 2, binding = 0) uniform TransformBuffer { mat4 transforms[500]; };
@@ -41,5 +41,5 @@ function lovr.draw(pass)
   pass:setCullMode('back')
   pass:setBlendMode(nil)
   pass:send('TransformBuffer', buffer)
-  pass:draw(model, mat4(), nil, nil, MONKEYS)
+  pass:draw(model, mat4(), MONKEYS)
 end

+ 6 - 9
examples/Optimization/Instancing_-_Compute/main.lua

@@ -61,18 +61,15 @@ end
 
 -- Draw many copies of the model using instancing, with transforms from a buffer
 function lovr.draw(pass)
-  local computer = lovr.graphics.getPass('compute')
-  computer:setShader(computeShader)
-  computer:send('monkeyCount', MONKEYS)
-  computer:send('TransformBuffer', transformBuffer)
-  computer:send('OffsetBuffer', offsetBuffer)
-  computer:compute(math.ceil(MONKEYS / 32))
+  pass:setShader(computeShader)
+  pass:send('monkeyCount', MONKEYS)
+  pass:send('TransformBuffer', transformBuffer)
+  pass:send('OffsetBuffer', offsetBuffer)
+  pass:compute(math.ceil(MONKEYS / 32))
 
   pass:setShader(shader)
   pass:send('TransformBuffer', transformBuffer)
   pass:setCullMode('back')
   pass:setBlendMode(nil)
-  pass:draw(model, mat4(), nil, nil, MONKEYS)
-
-  return lovr.graphics.submit(computer, pass)
+  pass:draw(model, mat4(), MONKEYS)
 end