From ec85648af3316d5e43c7b57fca55d0dad3d03f96 Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 25 Sep 2019 21:46:34 -0300
Subject: gl_shader_disk_cache: Store and load fast BRX

---
 .../engines/const_buffer_engine_interface.h        | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'src/video_core/engines')

diff --git a/src/video_core/engines/const_buffer_engine_interface.h b/src/video_core/engines/const_buffer_engine_interface.h
index c0e3a3a17..80f470777 100644
--- a/src/video_core/engines/const_buffer_engine_interface.h
+++ b/src/video_core/engines/const_buffer_engine_interface.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <type_traits>
 #include "common/bit_field.h"
 #include "common/common_types.h"
 #include "video_core/engines/shader_bytecode.h"
@@ -29,51 +30,49 @@ struct SamplerDescriptor {
         u32 raw{};
     };
 
+    bool operator==(const SamplerDescriptor& rhs) const noexcept {
+        return raw == rhs.raw;
+    }
+
     static SamplerDescriptor FromTicTexture(Tegra::Texture::TextureType tic_texture_type) {
-        SamplerDescriptor result{};
+        SamplerDescriptor result;
         switch (tic_texture_type) {
-        case Tegra::Texture::TextureType::Texture1D: {
+        case Tegra::Texture::TextureType::Texture1D:
             result.texture_type.Assign(Tegra::Shader::TextureType::Texture1D);
             result.is_array.Assign(0);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
-        }
-        case Tegra::Texture::TextureType::Texture2D: {
+        case Tegra::Texture::TextureType::Texture2D:
             result.texture_type.Assign(Tegra::Shader::TextureType::Texture2D);
             result.is_array.Assign(0);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
-        }
-        case Tegra::Texture::TextureType::Texture3D: {
+        case Tegra::Texture::TextureType::Texture3D:
             result.texture_type.Assign(Tegra::Shader::TextureType::Texture3D);
             result.is_array.Assign(0);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
-        }
-        case Tegra::Texture::TextureType::TextureCubemap: {
+        case Tegra::Texture::TextureType::TextureCubemap:
             result.texture_type.Assign(Tegra::Shader::TextureType::TextureCube);
             result.is_array.Assign(0);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
-        }
-        case Tegra::Texture::TextureType::Texture1DArray: {
+        case Tegra::Texture::TextureType::Texture1DArray:
             result.texture_type.Assign(Tegra::Shader::TextureType::Texture1D);
             result.is_array.Assign(1);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
-        }
-        case Tegra::Texture::TextureType::Texture2DArray: {
+        case Tegra::Texture::TextureType::Texture2DArray:
             result.texture_type.Assign(Tegra::Shader::TextureType::Texture2D);
             result.is_array.Assign(1);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
-        }
         case Tegra::Texture::TextureType::Texture1DBuffer: {
             result.texture_type.Assign(Tegra::Shader::TextureType::Texture1D);
             result.is_array.Assign(0);
@@ -81,30 +80,28 @@ struct SamplerDescriptor {
             result.is_shadow.Assign(0);
             return result;
         }
-        case Tegra::Texture::TextureType::Texture2DNoMipmap: {
+        case Tegra::Texture::TextureType::Texture2DNoMipmap:
             result.texture_type.Assign(Tegra::Shader::TextureType::Texture2D);
             result.is_array.Assign(0);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
-        }
-        case Tegra::Texture::TextureType::TextureCubeArray: {
+        case Tegra::Texture::TextureType::TextureCubeArray:
             result.texture_type.Assign(Tegra::Shader::TextureType::TextureCube);
             result.is_array.Assign(1);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
-        }
-        default: {
+        default:
             result.texture_type.Assign(Tegra::Shader::TextureType::Texture2D);
             result.is_array.Assign(0);
             result.is_buffer.Assign(0);
             result.is_shadow.Assign(0);
             return result;
         }
-        }
     }
 };
+static_assert(std::is_trivially_copyable_v<SamplerDescriptor>);
 
 class ConstBufferEngineInterface {
 public:
-- 
cgit v1.2.3