Merge pull request #6224 from aliaspider/master

(D3D11) multi-pass shaders: add support for feed-back textures.

gfx/common/d3d11_common.h

@@ -2555,6 +2555,7 @@ typedef struct
       D3D11SamplerStateRef       sampler;
       D3D11Buffer                buffers[SLANG_CBUFFER_MAX];
       d3d11_texture_t            rt;
+      d3d11_texture_t            feedback;
       D3D11_VIEWPORT             viewport;
       pass_semantics_t           semantics;
       D3D11ShaderResourceViewRef textures[SLANG_NUM_BINDINGS];

gfx/drivers/d3d11.c

@@ -100,9 +100,11 @@ static void d3d11_free_shader_preset(d3d11_video_t* d3d11)
    {
       free(d3d11->shader_preset->pass[i].source.string.vertex);
       free(d3d11->shader_preset->pass[i].source.string.fragment);
+      free(d3d11->pass[i].semantics.textures);
       d3d11_release_shader(&d3d11->pass[i].shader);
       d3d11_release_texture(&d3d11->pass[i].rt);
-      free(d3d11->pass[i].semantics.textures);
+      d3d11_release_texture(&d3d11->pass[i].feedback);
+
       for (int j = 0; j < SLANG_CBUFFER_MAX; j++)
       {
          free(d3d11->pass[i].semantics.cbuffers[j].uniforms);
@@ -159,15 +161,15 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
    {
       {
          /* no history support yet */
-         texture_map_t texture_map[3 + GFX_MAX_SHADERS + GFX_MAX_TEXTURES + 1] = {
+         texture_map_t texture_map[3 + GFX_MAX_SHADERS * 2 + GFX_MAX_TEXTURES + 1] = {
             SL_TEXTURE_MAP(
-                  SLANG_TEXTURE_SEMANTIC_ORIGINAL, d3d11->frame.texture, d3d11->pass[i].sampler,
+                  SLANG_TEXTURE_SEMANTIC_ORIGINAL, d3d11->frame.texture.view,
-                  d3d11->frame.texture.size_data),
+                  d3d11->pass[i].sampler, d3d11->frame.texture.size_data),
             SL_TEXTURE_MAP(
-                  SLANG_TEXTURE_SEMANTIC_SOURCE, *source, d3d11->pass[i].sampler,
+                  SLANG_TEXTURE_SEMANTIC_SOURCE, source->view, d3d11->pass[i].sampler,
                   source->size_data),
             SL_TEXTURE_MAP(
-                  SLANG_TEXTURE_SEMANTIC_ORIGINAL_HISTORY, d3d11->frame.texture,
+                  SLANG_TEXTURE_SEMANTIC_ORIGINAL_HISTORY, d3d11->frame.texture.view,
                   d3d11->pass[i].sampler, d3d11->frame.texture.size_data),
          };
 
@@ -179,7 +181,15 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
             for (int j = 0; j < i; j++)
             {
                *ptr = (texture_map_t)SL_TEXTURE_MAP_ARRAY(
-                     SLANG_TEXTURE_SEMANTIC_PASS_OUTPUT, j, d3d11->pass[j].rt,
+                     SLANG_TEXTURE_SEMANTIC_PASS_OUTPUT, j, d3d11->pass[j].rt.view,
+                     d3d11->pass[i].sampler, d3d11->pass[j].rt.size_data);
+               ptr++;
+            }
+
+            for (int j = 0; j < GFX_MAX_SHADERS; j++)
+            {
+               *ptr = (texture_map_t)SL_TEXTURE_MAP_ARRAY(
+                     SLANG_TEXTURE_SEMANTIC_PASS_FEEDBACK, j, d3d11->pass[j].feedback.view,
                      d3d11->pass[i].sampler, d3d11->pass[j].rt.size_data);
                ptr++;
             }
@@ -187,7 +197,7 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
             for (int j = 0; j < d3d11->shader_preset->luts; j++)
             {
                *ptr = (texture_map_t)SL_TEXTURE_MAP_ARRAY(
-                     SLANG_TEXTURE_SEMANTIC_USER, j, d3d11->luts[j], d3d11->luts[j].sampler,
+                     SLANG_TEXTURE_SEMANTIC_USER, j, d3d11->luts[j].view, d3d11->luts[j].sampler,
                      d3d11->luts[j].size_data);
                ptr++;
             }
@@ -795,8 +805,12 @@ static bool d3d11_init_frame_textures(d3d11_video_t* d3d11, unsigned width, unsi
 
          RARCH_LOG("[D3D11]: Updating framebuffer size %u x %u.\n", width, height);
 
+         /* TODO: maybe use double buffering and grap the swapchain view
+          * instead when pass->feedback == true for the last pass ?
+          * (unless last pass is invalid anyway as a feedback source) */
+
          if ((i != (d3d11->shader_preset->passes - 1)) || (width != d3d11->vp.width) ||
-             (height != d3d11->vp.height))
+             (height != d3d11->vp.height) || pass->feedback)
          {
             d3d11->pass[i].viewport.Width    = width;
             d3d11->pass[i].viewport.Height   = height;
@@ -806,6 +820,12 @@ static bool d3d11_init_frame_textures(d3d11_video_t* d3d11, unsigned width, unsi
             d3d11->pass[i].rt.desc.BindFlags = D3D11_BIND_RENDER_TARGET;
             d3d11->pass[i].rt.desc.Format = glslang_format_to_dxgi(d3d11->pass[i].semantics.format);
             d3d11_init_texture(d3d11->device, &d3d11->pass[i].rt);
+
+            if (pass->feedback)
+            {
+               d3d11->pass[i].feedback.desc = d3d11->pass[i].rt.desc;
+               d3d11_init_texture(d3d11->device, &d3d11->pass[i].feedback);
+            }
          }
          else
          {
@@ -816,16 +836,6 @@ static bool d3d11_init_frame_textures(d3d11_video_t* d3d11, unsigned width, unsi
          }
 
          d3d11->pass[i].sampler = d3d11->samplers[pass->filter][pass->wrap];
-
-         for (int j = 0; j < d3d11->pass[i].semantics.texture_count; j++)
-         {
-            texture_sem_t*          texture_sem = &d3d11->pass[i].semantics.textures[j];
-            D3D11ShaderResourceView view    = ((d3d11_texture_t*)texture_sem->texture_data)->view;
-            D3D11SamplerStateRef    sampler = *(D3D11SamplerStateRef*)texture_sem->sampler_data;
-
-            d3d11->pass[i].textures[texture_sem->binding] = view;
-            d3d11->pass[i].samplers[texture_sem->binding] = sampler;
-         }
       }
    }
 
@@ -906,6 +916,31 @@ static bool d3d11_gfx_frame(
    {
       for (int i = 0; i < d3d11->shader_preset->passes; i++)
       {
+         if (d3d11->shader_preset->pass[i].feedback)
+         {
+            d3d11_texture_t tmp     = d3d11->pass[i].feedback;
+            d3d11->pass[i].feedback = d3d11->pass[i].rt;
+            d3d11->pass[i].rt       = tmp;
+         }
+      }
+
+      for (int i = 0; i < d3d11->shader_preset->passes; i++)
+      {
+         {
+            texture_sem_t* texture_sem = d3d11->pass[i].semantics.textures;
+
+            while (texture_sem->stage_mask)
+            {
+               D3D11ShaderResourceView view = *(D3D11ShaderResourceView*)texture_sem->texture_data;
+               D3D11SamplerStateRef    sampler = *(D3D11SamplerStateRef*)texture_sem->sampler_data;
+
+               d3d11->pass[i].textures[texture_sem->binding] = view;
+               d3d11->pass[i].samplers[texture_sem->binding] = sampler;
+
+               texture_sem++;
+            }
+         }
+
          if (d3d11->shader_preset->pass[i].frame_count_mod)
             d3d11->pass[i].frame_count =
                   frame_count % d3d11->shader_preset->pass[i].frame_count_mod;

gfx/drivers_shader/slang_process.cpp

@@ -241,6 +241,9 @@ static bool slang_process_reflection(
             strncpy(texture.id, id.c_str(), sizeof(texture.id));
 
             textures.push_back(texture);
+
+            if(texture_map->semantic == SLANG_TEXTURE_SEMANTIC_PASS_FEEDBACK)
+               shader_info->pass[texture_map->index].feedback = true;
          }
 
          if (src.push_constant || src.uniform)

gfx/video_shader_parse.h

@@ -119,6 +119,7 @@ struct video_shader_pass
    bool mipmap;
    unsigned filter;
    unsigned frame_count_mod;
+   bool feedback;
 };
 
 struct video_shader_lut