removed deferred

Author: hoffstadt-nasa

assets/core/scenes/scene-helmet.json

@@ -9,7 +9,7 @@
         "bPhysicsDebugDraw": false,
         "bDrawAllBoundingBoxes": false,
         "bFrustumCulling": true,
-        "bMSAA": false,
+        "bMSAA": true,
         "szIndexBufferSize": 32000000,
         "szVertexBufferSize": 32000000,
         "szDataBufferSize": 32000000,
@@ -45,7 +45,7 @@
         "renderer": {
             "lighting": {
                 "tFlags": [
-                    "_____PL_RENDERER_LIGHTING_FLAGS_IMAGE_BASED",
+                    "PL_RENDERER_LIGHTING_FLAGS_IMAGE_BASED",
                     "PL_RENDERER_LIGHTING_FLAGS_NORMAL_MAPPING",
                     "PL_RENDERER_LIGHTING_FLAGS_PUNCTUAL_LIGHTS"
                 ]
@@ -105,7 +105,7 @@
         },
         "probes": [
             {
-                "active": false,
+                "active": true,
                 "tPosition": [0.0, 5.0, 0.0],
                 "fRange": 30.0,
                 "uResolution": 128,

extensions/pl_draw_ext.c

@@ -4922,8 +4922,6 @@ pl__get_2d_pipeline(uint32_t uMSAASampleCount, const plRenderAttachmentFormatInf
                 .tAlphaOp        = PL_BLEND_OP_ADD
             }
         },
-        .auColorAttachmentIndices = {0},
-        .uColorAttachmentCount = 1,
         .atBindGroupLayouts = {
             {
                 .atSamplerBindings = {
@@ -4979,8 +4977,6 @@ pl__get_2d_pipeline(uint32_t uMSAASampleCount, const plRenderAttachmentFormatInf
                 .tAlphaOp        = PL_BLEND_OP_ADD
             }
         },
-        .auColorAttachmentIndices = {0},
-        .uColorAttachmentCount = 1,
         .atBindGroupLayouts = {
             {
                 .atSamplerBindings = {

extensions/pl_graphics_ext.c

@@ -966,7 +966,6 @@ pl_load_graphics_ext(plApiRegistryI* ptApiRegistry, bool bReload)
         .set_roles                              = pl_graphics_set_roles,
         .reset_roles                            = pl_graphics_reset_roles,
         .change_texture_role                    = pl_graphics_change_texture_role,
-        .set_attachment_mapping                 = pl_graphics_set_attachment_mapping,
         .end_render_pass                        = pl_graphics_end_render_pass,
         .begin_compute_pass                     = pl_graphics_begin_compute_pass,
         .end_compute_pass                       = pl_graphics_end_compute_pass,

extensions/pl_graphics_ext.h

@@ -612,8 +612,6 @@ typedef struct _plGraphicsI
     void               (*set_roles)                 (plCommandBuffer*, const plPassResources*);
     void               (*end_render_pass)           (plCommandBuffer*);
     void               (*change_texture_role)(plCommandBuffer*, plTextureHandle, plPassResourceRole, plPassResourceAccess, plPassResourceRole, plPassResourceAccess);
-    void               (*set_attachment_mapping)(plCommandBuffer*, uint32_t uCount, const uint32_t* puColorAttachmentIndices);
-
     // render encoder: draw stream (preferred system)
     //   Notes:
     //     - call reset_draw_stream(...) with the maximum number of possible calls to
@@ -1131,11 +1129,6 @@ typedef struct _plShaderDesc
 
     // new
     plRenderAttachmentFormatInfo tRenderAttachmentFormatInfo;
-    uint32_t uColorAttachmentCount;
-    uint32_t uColorInputAttachmentCount;
-    uint32_t auColorAttachmentIndices[PL_MAX_RENDER_TARGETS];
-    uint32_t auColorInputAttachmentIndices[PL_MAX_RENDER_TARGETS];
-    uint32_t uDepthInputAttachmentIndex;
 
     // [INTERNAL]
     uint32_t                _uVertexConstantCount;
@@ -1161,6 +1154,7 @@ typedef struct _plRenderAttachment
     plStoreOp       tStoreOp;
     plTextureUsage  tUsage;
     plTextureHandle tTexture;
+    plTextureHandle tResolveTexture;
     plVec4          tClearColor;
     float           fClearZ;
     uint32_t        uClearStencil;
@@ -1431,8 +1425,7 @@ enum _plTextureUsage
     PL_TEXTURE_USAGE_COLOR_ATTACHMENT         = 1 << 1,
     PL_TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT = 1 << 2,
     PL_TEXTURE_USAGE_PRESENT                  = 1 << 3,
-    PL_TEXTURE_USAGE_INPUT_ATTACHMENT         = 1 << 4,
-    PL_TEXTURE_USAGE_STORAGE                  = 1 << 5
+    PL_TEXTURE_USAGE_STORAGE                  = 1 << 4
 };
 
 enum _plBufferUsage
@@ -1536,8 +1529,7 @@ enum _plPassResourceRole
     PL_PASS_RESOURCE_ROLE_STORAGE       = 1 << 1, // storage texture/buffer read/write
     PL_PASS_RESOURCE_ROLE_ATTACHMENT    = 1 << 2, // render target/depth
     PL_PASS_RESOURCE_ROLE_TRANSFER      = 1 << 3, // copy/mipmap
-    PL_PASS_RESOURCE_ROLE_PRESENT       = 1 << 4,
-    PL_PASS_RESOURCE_ROLE_INPUT_ATTACHMENT = 1 << 5,
+    PL_PASS_RESOURCE_ROLE_PRESENT       = 1 << 4
 };
 
 enum _plCullMode

extensions/pl_graphics_metal.m

@@ -894,9 +894,7 @@
     ptTextureDescriptor.sampleCount = ptDesc->tSampleCount == 0 ? 1 : ptDesc->tSampleCount;
 
     if(tDesc.tUsage & PL_TEXTURE_USAGE_SAMPLED)
-        ptTextureDescriptor.usage |= MTLTextureUsageShaderRead | MTLTextureUsageShaderWrite;
-    if(tDesc.tUsage & PL_TEXTURE_USAGE_INPUT_ATTACHMENT)
-        ptTextureDescriptor.usage |= MTLTextureUsageShaderRead;    
+        ptTextureDescriptor.usage |= MTLTextureUsageShaderRead | MTLTextureUsageShaderWrite; 
     if(tDesc.tUsage & PL_TEXTURE_USAGE_COLOR_ATTACHMENT)
         ptTextureDescriptor.usage |= MTLTextureUsageRenderTarget;
     if(tDesc.tUsage & PL_TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT)
@@ -1098,7 +1096,7 @@
         MTLResourceID* pptDestination = (MTLResourceID*)&pulDescriptorStart[ptUpdate->uSlot + ptUpdate->uIndex];
         *pptDestination = ptMetalTexture->tTexture.gpuResourceID;
 
-        int iCommonBits = ptTexture->tDesc.tUsage & (PL_TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT | PL_TEXTURE_USAGE_COLOR_ATTACHMENT |PL_TEXTURE_USAGE_INPUT_ATTACHMENT | PL_TEXTURE_USAGE_STORAGE);
+        int iCommonBits = ptTexture->tDesc.tUsage & (PL_TEXTURE_USAGE_DEPTH_STENCIL_ATTACHMENT | PL_TEXTURE_USAGE_COLOR_ATTACHMENT | PL_TEXTURE_USAGE_STORAGE);
         if(iCommonBits)
         {
             pl_sb_push(ptBindGroup->_sbtTextures, ptUpdate->tTexture);