(slang_reflection) Rewrite code from C++11 to C++98

Author: LibretroAdmin

gfx/drivers_shader/slang_reflection.cpp

@@ -31,7 +31,7 @@ static const char *texture_semantic_names[] = {
    "PassOutput",
    "PassFeedback",
    "User",
-   nullptr
+   NULL
 };
 
 static const char *texture_semantic_uniform_names[] = {
@@ -41,7 +41,7 @@ static const char *texture_semantic_uniform_names[] = {
    "PassOutputSize",
    "PassFeedbackSize",
    "UserSize",
-   nullptr
+   NULL
 };
 
 static const char *semantic_uniform_names[] = {
@@ -74,8 +74,9 @@ static slang_texture_semantic slang_name_to_texture_semantic(
       const std::unordered_map<std::string, slang_texture_semantic_map> &semantic_map,
       const std::string &name, unsigned *index)
 {
-   auto itr = semantic_map.find(name);
-   if (itr != end(semantic_map))
+   std::unordered_map<std::string, slang_texture_semantic_map>::const_iterator itr =
+      semantic_map.find(name);
+   if (itr != semantic_map.end())
    {
       *index = itr->second.index;
       return itr->second.semantic;
@@ -89,8 +90,9 @@ static slang_texture_semantic slang_uniform_name_to_texture_semantic(
       const std::unordered_map<std::string, slang_texture_semantic_map> &semantic_map,
       const std::string &name, unsigned *index)
 {
-   auto itr = semantic_map.find(name);
-   if (itr != end(semantic_map))
+   std::unordered_map<std::string, slang_texture_semantic_map>::const_iterator itr =
+      semantic_map.find(name);
+   if (itr != semantic_map.end())
    {
       *index = itr->second.index;
       return itr->second.semantic;
@@ -105,21 +107,21 @@ static slang_semantic slang_uniform_name_to_semantic(
       const std::string &name, unsigned *index)
 {
    unsigned i = 0;
-   auto itr   = semantic_map.find(name);
+   std::unordered_map<std::string, slang_semantic_map>::const_iterator itr =
+      semantic_map.find(name);
 
-   if (itr != end(semantic_map))
+   if (itr != semantic_map.end())
    {
       *index = itr->second.index;
       return itr->second.semantic;
    }
 
    /* No builtin semantics are arrayed. */
    *index = 0;
-   for (auto n : semantic_uniform_names)
+   for (i = 0; i < sizeof(semantic_uniform_names) / sizeof(semantic_uniform_names[0]); i++)
    {
-      if (name == n)
+      if (name == semantic_uniform_names[i])
          return static_cast<slang_semantic>(i);
-      i++;
    }
 
    return SLANG_INVALID_SEMANTIC;
@@ -140,7 +142,7 @@ static bool set_ubo_texture_offset(
 {
    resize_minimum(reflection->semantic_textures[semantic], index + 1);
    slang_texture_semantic_meta &sem = reflection->semantic_textures[semantic][index];
-   bool &active                     = push_constant ? sem.push_constant : sem.uniform;
+   bool   &active                   = push_constant ? sem.push_constant : sem.uniform;
    size_t &active_offset            = push_constant ? sem.push_constant_offset : sem.ubo_offset;
 
    if (active)
@@ -209,7 +211,7 @@ static bool set_ubo_offset(
       size_t offset, unsigned num_components, bool push_constant)
 {
    slang_semantic_meta &sem = reflection->semantics[semantic];
-   bool &active             = push_constant ? sem.push_constant : sem.uniform;
+   bool   &active           = push_constant ? sem.push_constant : sem.uniform;
    size_t &active_offset    = push_constant ? sem.push_constant_offset : sem.ubo_offset;
 
    if (active)
@@ -223,7 +225,6 @@ static bool set_ubo_offset(
                unsigned(offset));
          return false;
       }
-
    }
 
    if (  (sem.num_components != num_components) &&
@@ -372,7 +373,8 @@ static bool add_active_buffer_ranges(
 {
    unsigned i;
    /* Get which uniforms are actually in use by this shader. */
-   auto ranges = compiler.get_active_buffer_ranges(resource.id);
+   spirv_cross::SmallVector<spirv_cross::BufferRange> ranges =
+      compiler.get_active_buffer_ranges(resource.id);
 
    for (i = 0; i < ranges.size(); i++)
    {
@@ -389,7 +391,8 @@ static bool add_active_buffer_ranges(
             *reflection->texture_semantic_uniform_map,
             name, &tex_sem_index);
 
-      if (tex_sem == SLANG_TEXTURE_SEMANTIC_PASS_OUTPUT && tex_sem_index >= reflection->pass_number)
+      if (tex_sem == SLANG_TEXTURE_SEMANTIC_PASS_OUTPUT &&
+            tex_sem_index >= reflection->pass_number)
       {
          RARCH_ERR("[Slang] Non causal filter chain detected. "
                "Shader is trying to use output from pass #%u,"
@@ -447,9 +450,17 @@ static bool add_active_buffer_ranges(
 
 
 slang_reflection::slang_reflection()
+   : ubo_size(0),
+     push_constant_size(0),
+     ubo_binding(0),
+     ubo_stage_mask(0),
+     push_constant_stage_mask(0),
+     texture_semantic_map(NULL),
+     texture_semantic_uniform_map(NULL),
+     semantic_map(NULL),
+     pass_number(0)
 {
    unsigned i;
-
    for (i = 0; i < SLANG_NUM_TEXTURE_SEMANTICS; i++)
       semantic_textures[i].resize(
             slang_texture_semantic_is_array(
@@ -537,14 +548,18 @@ bool slang_reflect(
 
    if (fragment.push_constant_buffers.size() > 1)
    {
-      RARCH_ERR("[Slang] Fragment must use zero or one push cosntant buffer.\n");
+      RARCH_ERR("[Slang] Fragment must use zero or one push constant buffer.\n");
       return false;
    }
 
-   uint32_t vertex_ubo    = vertex.uniform_buffers.empty() ? 0 : (uint32_t)vertex.uniform_buffers[0].id;
-   uint32_t fragment_ubo  = fragment.uniform_buffers.empty() ? 0 : (uint32_t)fragment.uniform_buffers[0].id;
-   uint32_t vertex_push   = vertex.push_constant_buffers.empty() ? 0 : (uint32_t)vertex.push_constant_buffers[0].id;
-   uint32_t fragment_push = fragment.push_constant_buffers.empty() ? 0 : (uint32_t)fragment.push_constant_buffers[0].id;
+   uint32_t vertex_ubo    = vertex.uniform_buffers.empty()
+      ? 0 : (uint32_t)vertex.uniform_buffers[0].id;
+   uint32_t fragment_ubo  = fragment.uniform_buffers.empty()
+      ? 0 : (uint32_t)fragment.uniform_buffers[0].id;
+   uint32_t vertex_push   = vertex.push_constant_buffers.empty()
+      ? 0 : (uint32_t)vertex.push_constant_buffers[0].id;
+   uint32_t fragment_push = fragment.push_constant_buffers.empty()
+      ? 0 : (uint32_t)fragment.push_constant_buffers[0].id;
 
    if (vertex_ubo &&
          vertex_compiler.get_decoration(
@@ -564,21 +579,21 @@ bool slang_reflect(
 
    unsigned vertex_ubo_binding   = vertex_ubo
       ? vertex_compiler.get_decoration(vertex_ubo, spv::DecorationBinding)
-      : -1u;
+      : (unsigned)-1;
    unsigned fragment_ubo_binding = fragment_ubo
       ? fragment_compiler.get_decoration(fragment_ubo, spv::DecorationBinding)
-      : -1u;
+      : (unsigned)-1;
    bool has_ubo                  = vertex_ubo || fragment_ubo;
 
-   if (  (vertex_ubo_binding   != -1u) &&
-         (fragment_ubo_binding != -1u) &&
+   if (  (vertex_ubo_binding   != (unsigned)-1) &&
+         (fragment_ubo_binding != (unsigned)-1) &&
          (vertex_ubo_binding   != fragment_ubo_binding))
    {
       RARCH_ERR("[Slang] Vertex and fragment uniform buffer must have same binding.\n");
       return false;
    }
 
-   unsigned ubo_binding = (vertex_ubo_binding != -1u)
+   unsigned ubo_binding = (vertex_ubo_binding != (unsigned)-1)
       ? vertex_ubo_binding
       : fragment_ubo_binding;
 
@@ -696,7 +711,8 @@ bool slang_reflect(
             *reflection->texture_semantic_map,
             fragment.sampled_images[i].name, &array_index);
 
-      if (index == SLANG_TEXTURE_SEMANTIC_PASS_OUTPUT && array_index >= reflection->pass_number)
+      if (index == SLANG_TEXTURE_SEMANTIC_PASS_OUTPUT &&
+            array_index >= reflection->pass_number)
       {
          RARCH_ERR("[Slang] Non causal filter chain detected. "
                "Shader is trying to use output from pass #%u,"
@@ -728,8 +744,10 @@ bool slang_reflect(
    for (i = 0; i < SLANG_NUM_TEXTURE_SEMANTICS; i++)
    {
       unsigned index = 0;
-      for (auto &sem : reflection->semantic_textures[i])
+      unsigned j;
+      for (j = 0; j < reflection->semantic_textures[i].size(); j++)
       {
+         const slang_texture_semantic_meta &sem = reflection->semantic_textures[i][j];
          if (sem.texture)
             RARCH_LOG("[Slang]      %s (#%u)\n",
                   texture_semantic_names[i], index);
@@ -764,8 +782,10 @@ bool slang_reflect(
    for (i = 0; i < SLANG_NUM_TEXTURE_SEMANTICS; i++)
    {
       unsigned index = 0;
-      for (auto &sem : reflection->semantic_textures[i])
+      unsigned j;
+      for (j = 0; j < reflection->semantic_textures[i].size(); j++)
       {
+         const slang_texture_semantic_meta &sem = reflection->semantic_textures[i][j];
          if (sem.uniform)
          {
             RARCH_LOG("[Slang]      %s (#%u) (Offset: %u)\n",
@@ -789,18 +809,14 @@ bool slang_reflect(
 
    for (i = 0; i < reflection->semantic_float_parameters.size(); i++)
    {
-      slang_semantic_meta *param = (slang_semantic_meta*)
-         &reflection->semantic_float_parameters[i];
-
-      if (!param)
-         continue;
+      const slang_semantic_meta &param = reflection->semantic_float_parameters[i];
 
-      if (param->uniform)
+      if (param.uniform)
          RARCH_LOG("[Slang]     #%u (Offset: %u)\n", i,
-               (unsigned int)param->ubo_offset);
-      if (param->push_constant)
+               (unsigned int)param.ubo_offset);
+      if (param.push_constant)
          RARCH_LOG("[Slang]     #%u (PushOffset: %u)\n", i,
-               (unsigned int)param->push_constant_offset);
+               (unsigned int)param.push_constant_offset);
    }
 #endif
 

gfx/drivers_shader/slang_reflection.hpp

@@ -23,69 +23,82 @@
 
 struct slang_semantic_location
 {
-   int ubo_vertex    = -1;
-   int push_vertex   = -1;
-   int ubo_fragment  = -1;
-   int push_fragment = -1;
+   int ubo_vertex;
+   int push_vertex;
+   int ubo_fragment;
+   int push_fragment;
+
+   slang_semantic_location()
+      : ubo_vertex(-1), push_vertex(-1),
+        ubo_fragment(-1), push_fragment(-1) {}
 };
 
 struct slang_texture_semantic_meta
 {
-   size_t ubo_offset           = 0;
-   size_t push_constant_offset = 0;
-   unsigned binding            = 0;
-   uint32_t stage_mask         = 0;
+   size_t   ubo_offset;
+   size_t   push_constant_offset;
+   unsigned binding;
+   uint32_t stage_mask;
 
-   bool texture                = false;
-   bool uniform                = false;
-   bool push_constant          = false;
+   bool texture;
+   bool uniform;
+   bool push_constant;
 
    /* For APIs which need location information ala legacy GL.
     * API user fills this struct in. */
    slang_semantic_location location;
+
+   slang_texture_semantic_meta()
+      : ubo_offset(0), push_constant_offset(0),
+        binding(0), stage_mask(0),
+        texture(false), uniform(false), push_constant(false) {}
 };
 
 struct slang_semantic_meta
 {
-   size_t ubo_offset           = 0;
-   size_t push_constant_offset = 0;
-   unsigned num_components     = 0;
-   bool uniform                = false;
-   bool push_constant          = false;
+   size_t   ubo_offset;
+   size_t   push_constant_offset;
+   unsigned num_components;
+   bool     uniform;
+   bool     push_constant;
 
    /* For APIs which need location information ala legacy GL. */
    slang_semantic_location location;
+
+   slang_semantic_meta()
+      : ubo_offset(0), push_constant_offset(0),
+        num_components(0), uniform(false), push_constant(false) {}
 };
 
 struct slang_reflection
 {
    slang_reflection();
 
-   size_t ubo_size                   = 0;
-   size_t push_constant_size         = 0;
+   size_t   ubo_size;
+   size_t   push_constant_size;
 
-   unsigned ubo_binding              = 0;
-   uint32_t ubo_stage_mask           = 0;
-   uint32_t push_constant_stage_mask = 0;
+   unsigned ubo_binding;
+   uint32_t ubo_stage_mask;
+   uint32_t push_constant_stage_mask;
 
    std::vector<slang_texture_semantic_meta>
       semantic_textures[SLANG_NUM_TEXTURE_SEMANTICS];
    slang_semantic_meta semantics[SLANG_NUM_SEMANTICS];
    std::vector<slang_semantic_meta> semantic_float_parameters;
 
-   const std::unordered_map<std::string, slang_texture_semantic_map> *texture_semantic_map = nullptr;
-   const std::unordered_map<std::string, slang_texture_semantic_map> *texture_semantic_uniform_map = nullptr;
-   const std::unordered_map<std::string, slang_semantic_map> *semantic_map = nullptr;
-   unsigned pass_number = 0;
+   const std::unordered_map<std::string, slang_texture_semantic_map> *texture_semantic_map;
+   const std::unordered_map<std::string, slang_texture_semantic_map> *texture_semantic_uniform_map;
+   const std::unordered_map<std::string, slang_semantic_map>         *semantic_map;
+   unsigned pass_number;
 };
 
 template <typename P>
 static bool slang_set_unique_map(std::unordered_map<std::string, P> &m,
       const std::string &name, const P &p)
 {
-   auto itr = m.find(name);
+   typename std::unordered_map<std::string, P>::iterator itr = m.find(name);
    /* Alias already exists? */
-   if (itr != end(m))
+   if (itr != m.end())
       return false;
    m[name] = p;
    return true;