From be856a38d6b0c7c90c861baf3204ac48a108f3d2 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Thu, 17 Oct 2019 10:35:16 -0400 Subject: Shader_IR: Address Feedback. --- src/video_core/engines/const_buffer_engine_interface.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 80f470777..ac27b6cbe 100644 --- a/src/video_core/engines/const_buffer_engine_interface.h +++ b/src/video_core/engines/const_buffer_engine_interface.h @@ -34,6 +34,10 @@ struct SamplerDescriptor { return raw == rhs.raw; } + bool operator!=(const SamplerDescriptor& rhs) const noexcept { + return !operator==(rhs); + } + static SamplerDescriptor FromTicTexture(Tegra::Texture::TextureType tic_texture_type) { SamplerDescriptor result; switch (tic_texture_type) { @@ -73,13 +77,12 @@ struct SamplerDescriptor { result.is_buffer.Assign(0); result.is_shadow.Assign(0); return result; - case Tegra::Texture::TextureType::Texture1DBuffer: { + case Tegra::Texture::TextureType::Texture1DBuffer: result.texture_type.Assign(Tegra::Shader::TextureType::Texture1D); result.is_array.Assign(0); result.is_buffer.Assign(1); result.is_shadow.Assign(0); return result; - } case Tegra::Texture::TextureType::Texture2DNoMipmap: result.texture_type.Assign(Tegra::Shader::TextureType::Texture2D); result.is_array.Assign(0); @@ -105,7 +108,7 @@ static_assert(std::is_trivially_copyable_v); class ConstBufferEngineInterface { public: - virtual ~ConstBufferEngineInterface() {} + virtual ~ConstBufferEngineInterface() = default; virtual u32 AccessConstBuffer32(ShaderType stage, u64 const_buffer, u64 offset) const = 0; virtual SamplerDescriptor AccessBoundSampler(ShaderType stage, u64 offset) const = 0; virtual SamplerDescriptor AccessBindlessSampler(ShaderType stage, u64 const_buffer, -- cgit v1.2.3