Browse Source

mv some stuff into Pass; hardware->device;

unknown 3 years ago
parent
commit
0802b72c7e
57 changed files with 853 additions and 1031 deletions
  1. 838 924
      api/init.lua
  2. 1 5
      api/lovr/graphics/Buffer/init.lua
  3. 0 0
      api/lovr/graphics/Pass/box.lua
  4. 0 0
      api/lovr/graphics/Pass/circle.lua
  5. 0 0
      api/lovr/graphics/Pass/compute.lua
  6. 0 0
      api/lovr/graphics/Pass/cone.lua
  7. 0 0
      api/lovr/graphics/Pass/cube.lua
  8. 0 0
      api/lovr/graphics/Pass/cylinder.lua
  9. 0 0
      api/lovr/graphics/Pass/fill.lua
  10. 0 0
      api/lovr/graphics/Pass/getProjection.lua
  11. 0 0
      api/lovr/graphics/Pass/getViewPose.lua
  12. 4 0
      api/lovr/graphics/Pass/init.lua
  13. 0 0
      api/lovr/graphics/Pass/line.lua
  14. 0 0
      api/lovr/graphics/Pass/mesh.lua
  15. 0 0
      api/lovr/graphics/Pass/model.lua
  16. 0 0
      api/lovr/graphics/Pass/origin.lua
  17. 0 0
      api/lovr/graphics/Pass/plane.lua
  18. 0 0
      api/lovr/graphics/Pass/points.lua
  19. 0 0
      api/lovr/graphics/Pass/pop.lua
  20. 0 0
      api/lovr/graphics/Pass/print.lua
  21. 0 0
      api/lovr/graphics/Pass/push.lua
  22. 0 0
      api/lovr/graphics/Pass/replay.lua
  23. 0 0
      api/lovr/graphics/Pass/rotate.lua
  24. 0 0
      api/lovr/graphics/Pass/scale.lua
  25. 0 0
      api/lovr/graphics/Pass/setAlphaToCoverage.lua
  26. 0 0
      api/lovr/graphics/Pass/setBlendMode.lua
  27. 0 0
      api/lovr/graphics/Pass/setColorMask.lua
  28. 0 0
      api/lovr/graphics/Pass/setCullMode.lua
  29. 0 0
      api/lovr/graphics/Pass/setDepthClamp.lua
  30. 0 0
      api/lovr/graphics/Pass/setDepthOffset.lua
  31. 0 0
      api/lovr/graphics/Pass/setDepthTest.lua
  32. 0 0
      api/lovr/graphics/Pass/setDepthWrite.lua
  33. 0 0
      api/lovr/graphics/Pass/setProjection.lua
  34. 0 0
      api/lovr/graphics/Pass/setScissor.lua
  35. 0 0
      api/lovr/graphics/Pass/setShader.lua
  36. 0 0
      api/lovr/graphics/Pass/setStencilTest.lua
  37. 0 0
      api/lovr/graphics/Pass/setStencilWrite.lua
  38. 0 0
      api/lovr/graphics/Pass/setViewPose.lua
  39. 0 0
      api/lovr/graphics/Pass/setViewport.lua
  40. 0 0
      api/lovr/graphics/Pass/setWinding.lua
  41. 0 0
      api/lovr/graphics/Pass/setWireframe.lua
  42. 0 0
      api/lovr/graphics/Pass/skybox.lua
  43. 0 0
      api/lovr/graphics/Pass/sphere.lua
  44. 0 0
      api/lovr/graphics/Pass/transform.lua
  45. 0 0
      api/lovr/graphics/Pass/translate.lua
  46. 0 59
      api/lovr/graphics/begin.lua
  47. 0 10
      api/lovr/graphics/finish.lua
  48. 0 3
      api/lovr/graphics/getBackground.lua
  49. 6 11
      api/lovr/graphics/getDevice.lua
  50. 1 1
      api/lovr/graphics/getFeatures.lua
  51. 1 1
      api/lovr/graphics/getLimits.lua
  52. 1 1
      api/lovr/graphics/getStats.lua
  53. 1 1
      api/lovr/graphics/isFormatSupported.lua
  54. 0 10
      api/lovr/graphics/prepare.lua
  55. 0 3
      api/lovr/graphics/setBackground.lua
  56. 0 1
      api/lovr/graphics/submit.lua
  57. 0 1
      api/lovr/graphics/wait.lua

File diff suppressed because it is too large
+ 838 - 924
api/init.lua


+ 1 - 5
api/lovr/graphics/Buffer/init.lua

@@ -1,8 +1,4 @@
 return {
   summary = 'A block of memory on the GPU.',
-  description = 'TODO',
-  constructors = {
-    'lovr.graphics.newBuffer',
-    'lovr.graphics.getBuffer'
-  }
+  description = 'TODO'
 }

+ 0 - 0
api/lovr/graphics/box.lua → api/lovr/graphics/Pass/box.lua


+ 0 - 0
api/lovr/graphics/circle.lua → api/lovr/graphics/Pass/circle.lua


+ 0 - 0
api/lovr/graphics/compute.lua → api/lovr/graphics/Pass/compute.lua


+ 0 - 0
api/lovr/graphics/cone.lua → api/lovr/graphics/Pass/cone.lua


+ 0 - 0
api/lovr/graphics/cube.lua → api/lovr/graphics/Pass/cube.lua


+ 0 - 0
api/lovr/graphics/cylinder.lua → api/lovr/graphics/Pass/cylinder.lua


+ 0 - 0
api/lovr/graphics/fill.lua → api/lovr/graphics/Pass/fill.lua


+ 0 - 0
api/lovr/graphics/getProjection.lua → api/lovr/graphics/Pass/getProjection.lua


+ 0 - 0
api/lovr/graphics/getViewPose.lua → api/lovr/graphics/Pass/getViewPose.lua


+ 4 - 0
api/lovr/graphics/Pass/init.lua

@@ -0,0 +1,4 @@
+return {
+  summary = 'A self-contained stream of graphics commands.',
+  description = 'TODO'
+}

+ 0 - 0
api/lovr/graphics/line.lua → api/lovr/graphics/Pass/line.lua


+ 0 - 0
api/lovr/graphics/mesh.lua → api/lovr/graphics/Pass/mesh.lua


+ 0 - 0
api/lovr/graphics/model.lua → api/lovr/graphics/Pass/model.lua


+ 0 - 0
api/lovr/graphics/origin.lua → api/lovr/graphics/Pass/origin.lua


+ 0 - 0
api/lovr/graphics/plane.lua → api/lovr/graphics/Pass/plane.lua


+ 0 - 0
api/lovr/graphics/points.lua → api/lovr/graphics/Pass/points.lua


+ 0 - 0
api/lovr/graphics/pop.lua → api/lovr/graphics/Pass/pop.lua


+ 0 - 0
api/lovr/graphics/print.lua → api/lovr/graphics/Pass/print.lua


+ 0 - 0
api/lovr/graphics/push.lua → api/lovr/graphics/Pass/push.lua


+ 0 - 0
api/lovr/graphics/replay.lua → api/lovr/graphics/Pass/replay.lua


+ 0 - 0
api/lovr/graphics/rotate.lua → api/lovr/graphics/Pass/rotate.lua


+ 0 - 0
api/lovr/graphics/scale.lua → api/lovr/graphics/Pass/scale.lua


+ 0 - 0
api/lovr/graphics/setAlphaToCoverage.lua → api/lovr/graphics/Pass/setAlphaToCoverage.lua


+ 0 - 0
api/lovr/graphics/setBlendMode.lua → api/lovr/graphics/Pass/setBlendMode.lua


+ 0 - 0
api/lovr/graphics/setColorMask.lua → api/lovr/graphics/Pass/setColorMask.lua


+ 0 - 0
api/lovr/graphics/setCullMode.lua → api/lovr/graphics/Pass/setCullMode.lua


+ 0 - 0
api/lovr/graphics/setDepthClamp.lua → api/lovr/graphics/Pass/setDepthClamp.lua


+ 0 - 0
api/lovr/graphics/setDepthOffset.lua → api/lovr/graphics/Pass/setDepthOffset.lua


+ 0 - 0
api/lovr/graphics/setDepthTest.lua → api/lovr/graphics/Pass/setDepthTest.lua


+ 0 - 0
api/lovr/graphics/setDepthWrite.lua → api/lovr/graphics/Pass/setDepthWrite.lua


+ 0 - 0
api/lovr/graphics/setProjection.lua → api/lovr/graphics/Pass/setProjection.lua


+ 0 - 0
api/lovr/graphics/setScissor.lua → api/lovr/graphics/Pass/setScissor.lua


+ 0 - 0
api/lovr/graphics/setShader.lua → api/lovr/graphics/Pass/setShader.lua


+ 0 - 0
api/lovr/graphics/setStencilTest.lua → api/lovr/graphics/Pass/setStencilTest.lua


+ 0 - 0
api/lovr/graphics/setStencilWrite.lua → api/lovr/graphics/Pass/setStencilWrite.lua


+ 0 - 0
api/lovr/graphics/setViewPose.lua → api/lovr/graphics/Pass/setViewPose.lua


+ 0 - 0
api/lovr/graphics/setViewport.lua → api/lovr/graphics/Pass/setViewport.lua


+ 0 - 0
api/lovr/graphics/setWinding.lua → api/lovr/graphics/Pass/setWinding.lua


+ 0 - 0
api/lovr/graphics/setWireframe.lua → api/lovr/graphics/Pass/setWireframe.lua


+ 0 - 0
api/lovr/graphics/skybox.lua → api/lovr/graphics/Pass/skybox.lua


+ 0 - 0
api/lovr/graphics/sphere.lua → api/lovr/graphics/Pass/sphere.lua


+ 0 - 0
api/lovr/graphics/transform.lua → api/lovr/graphics/Pass/transform.lua


+ 0 - 0
api/lovr/graphics/translate.lua → api/lovr/graphics/Pass/translate.lua


+ 0 - 59
api/lovr/graphics/begin.lua

@@ -1,59 +0,0 @@
-return {
-  tag = 'work-submission',
-  summary = 'Begin a pass of graphics work.',
-  description = 'TODO',
-  arguments = {
-    type = {
-      type = 'PassType',
-      description = 'The type of pass to start.'
-    },
-    canvas = {
-      type = 'table',
-      description = 'The set of textures to render to, along with other rendering options.'
-    },
-    texture = {
-      type = 'Texture',
-      description = 'The texture to render to.'
-    },
-    batch = {
-      type = 'Batch',
-      description = 'The Batch to record commands to.'
-    },
-    order = {
-      type = 'number',
-      default = 'nil',
-      description = [[
-        A number between 1 and 100 used to define the order passes run in.  Passes with a smaller
-        order run before passes with a larger order.  Passes with the same order may run in any
-        order.  If `nil`, an autoincrementing number will be used, causing passes to run in the
-        order they are started.
-      ]]
-    }
-  },
-  returns = {},
-  variants = {
-    {
-      description = 'TODO (compute and transfer pass)',
-      arguments = { 'type', 'order' },
-      returns = {}
-    },
-    {
-      description = 'TODO',
-      arguments = { 'type', 'texture', 'order' },
-      returns = {}
-    },
-    {
-      description = 'TODO',
-      arguments = { 'type', 'canvas', 'order' },
-      returns = {}
-    },
-    {
-      description = 'TODO (batch pass)',
-      arguments = { 'type', 'batch', 'order' },
-      returns = {}
-    }
-  },
-  related = {
-    'lovr.graphics.finish'
-  }
-}

+ 0 - 10
api/lovr/graphics/finish.lua

@@ -1,10 +0,0 @@
-return {
-  tag = 'work-submission',
-  summary = 'Finish a pass.',
-  description = 'TODO',
-  arguments = {},
-  returns = {},
-  related = {
-    'lovr.graphics.begin'
-  }
-}

+ 0 - 3
api/lovr/graphics/getBackground.lua

@@ -24,8 +24,5 @@ return {
       type = 'number',
       description = 'The alpha component of the background color.',
     }
-  },
-  related = {
-    'lovr.graphics.begin'
   }
 }

+ 6 - 11
api/lovr/graphics/getHardware.lua → api/lovr/graphics/getDevice.lua

@@ -5,7 +5,7 @@ return {
   arguments = {},
   returns = {
     {
-      name = 'hardware',
+      name = 'device',
       type = 'table',
       description = 'Information about the GPU device.',
       table = {
@@ -15,17 +15,17 @@ return {
           description = 'TODO'
         },
         {
-          name = 'name',
-          type = 'string',
+          name = 'vendor',
+          type = 'number',
           description = 'TODO'
         },
         {
-          name = 'vendor',
-          type = 'number',
+          name = 'name',
+          type = 'string',
           description = 'TODO'
         },
         {
-          name = 'driver',
+          name = 'renderer',
           type = 'string',
           description = 'TODO'
         },
@@ -38,11 +38,6 @@ return {
           name = 'discrete',
           type = 'boolean',
           description = 'TODO'
-        },
-        {
-          name = 'renderer',
-          type = 'string',
-          description = 'TODO'
         }
       }
     }

+ 1 - 1
api/lovr/graphics/getFeatures.lua

@@ -74,7 +74,7 @@ return {
   },
   related = {
     'lovr.graphics.isFormatSupported',
-    'lovr.graphics.getHardware',
+    'lovr.graphics.getDevice',
     'lovr.graphics.getLimits',
     'lovr.graphics.getStats'
   }

+ 1 - 1
api/lovr/graphics/getLimits.lua

@@ -119,7 +119,7 @@ return {
   },
   related = {
     'lovr.graphics.isFormatSupported',
-    'lovr.graphics.getHardware',
+    'lovr.graphics.getDevice',
     'lovr.graphics.getFeatures',
     'lovr.graphics.getStats'
   }

+ 1 - 1
api/lovr/graphics/getStats.lua

@@ -151,7 +151,7 @@ return {
     }
   },
   related = {
-    'lovr.graphics.getHardware',
+    'lovr.graphics.getDevice',
     'lovr.graphics.getFeatures',
     'lovr.graphics.getLimits'
   }

+ 1 - 1
api/lovr/graphics/isFormatSupported.lua

@@ -22,7 +22,7 @@ return {
     }
   },
   related = {
-    'lovr.graphics.getHardware',
+    'lovr.graphics.getDevice',
     'lovr.graphics.getFeatures',
     'lovr.graphics.getLimits'
   }

+ 0 - 10
api/lovr/graphics/prepare.lua

@@ -1,10 +0,0 @@
-return {
-  tag = 'work-submission',
-  summary = 'Start recording graphics work.',
-  description = 'TODO',
-  arguments = {},
-  returns = {},
-  related = {
-    'lovr.graphics.submit'
-  }
-}

+ 0 - 3
api/lovr/graphics/setBackground.lua

@@ -48,8 +48,5 @@ return {
       arguments = { 'color' },
       returns = {}
     }
-  },
-  related = {
-    'lovr.graphics.begin'
   }
 }

+ 0 - 1
api/lovr/graphics/submit.lua

@@ -5,7 +5,6 @@ return {
   arguments = {},
   returns = {},
   related = {
-    'lovr.graphics.prepare',
     'lovr.graphics.wait'
   }
 }

+ 0 - 1
api/lovr/graphics/wait.lua

@@ -5,7 +5,6 @@ return {
   arguments = {},
   returns = {},
   related = {
-    'lovr.graphics.prepare',
     'lovr.graphics.submit'
   }
 }

Some files were not shown because too many files changed in this diff