diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-15 02:22:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-15 02:22:34 +0100 |
| commit | 6788ebffc8cc5b3b265d78205ca62e1d59ed2ed9 (patch) | |
| tree | 2cc9377d0bec0781c8a86e691f2fd1442225fe79 /src/video_core/textures | |
| parent | Merge pull request #2230 from lioncash/global (diff) | |
| parent | vk_sampler_cache: Use operator== instead of memcmp (diff) | |
| download | yuzu-6788ebffc8cc5b3b265d78205ca62e1d59ed2ed9.tar yuzu-6788ebffc8cc5b3b265d78205ca62e1d59ed2ed9.tar.gz yuzu-6788ebffc8cc5b3b265d78205ca62e1d59ed2ed9.tar.bz2 yuzu-6788ebffc8cc5b3b265d78205ca62e1d59ed2ed9.tar.lz yuzu-6788ebffc8cc5b3b265d78205ca62e1d59ed2ed9.tar.xz yuzu-6788ebffc8cc5b3b265d78205ca62e1d59ed2ed9.tar.zst yuzu-6788ebffc8cc5b3b265d78205ca62e1d59ed2ed9.zip | |
Diffstat (limited to 'src/video_core/textures')
| -rw-r--r-- | src/video_core/textures/texture.h | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/src/video_core/textures/texture.h b/src/video_core/textures/texture.h index b8675f702..93ecc6e31 100644 --- a/src/video_core/textures/texture.h +++ b/src/video_core/textures/texture.h @@ -283,31 +283,36 @@ enum class TextureMipmapFilter : u32 { struct TSCEntry { union { - BitField<0, 3, WrapMode> wrap_u; - BitField<3, 3, WrapMode> wrap_v; - BitField<6, 3, WrapMode> wrap_p; - BitField<9, 1, u32> depth_compare_enabled; - BitField<10, 3, DepthCompareFunc> depth_compare_func; - BitField<13, 1, u32> srgb_conversion; - BitField<20, 3, u32> max_anisotropy; + struct { + union { + BitField<0, 3, WrapMode> wrap_u; + BitField<3, 3, WrapMode> wrap_v; + BitField<6, 3, WrapMode> wrap_p; + BitField<9, 1, u32> depth_compare_enabled; + BitField<10, 3, DepthCompareFunc> depth_compare_func; + BitField<13, 1, u32> srgb_conversion; + BitField<20, 3, u32> max_anisotropy; + }; + union { + BitField<0, 2, TextureFilter> mag_filter; + BitField<4, 2, TextureFilter> min_filter; + BitField<6, 2, TextureMipmapFilter> mipmap_filter; + BitField<9, 1, u32> cubemap_interface_filtering; + BitField<12, 13, u32> mip_lod_bias; + }; + union { + BitField<0, 12, u32> min_lod_clamp; + BitField<12, 12, u32> max_lod_clamp; + BitField<24, 8, u32> srgb_border_color_r; + }; + union { + BitField<12, 8, u32> srgb_border_color_g; + BitField<20, 8, u32> srgb_border_color_b; + }; + std::array<f32, 4> border_color; + }; + std::array<u8, 0x20> raw; }; - union { - BitField<0, 2, TextureFilter> mag_filter; - BitField<4, 2, TextureFilter> min_filter; - BitField<6, 2, TextureMipmapFilter> mipmap_filter; - BitField<9, 1, u32> cubemap_interface_filtering; - BitField<12, 13, u32> mip_lod_bias; - }; - union { - BitField<0, 12, u32> min_lod_clamp; - BitField<12, 12, u32> max_lod_clamp; - BitField<24, 8, u32> srgb_border_color_r; - }; - union { - BitField<12, 8, u32> srgb_border_color_g; - BitField<20, 8, u32> srgb_border_color_b; - }; - std::array<f32, 4> border_color; float GetMaxAnisotropy() const { return static_cast<float>(1U << max_anisotropy); |