summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-03-27 04:33:45 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-03-27 04:36:22 +0100
commitcedbe925cdff42b8eb4671f7de490cbdc0ebd780 (patch)
treebc9ec2d5ff4a06f8fcc47880a4c0783f203dbcd3 /src/video_core
parentMerge pull request #3544 from makigumo/myfork/patch-2 (diff)
downloadyuzu-cedbe925cdff42b8eb4671f7de490cbdc0ebd780.tar
yuzu-cedbe925cdff42b8eb4671f7de490cbdc0ebd780.tar.gz
yuzu-cedbe925cdff42b8eb4671f7de490cbdc0ebd780.tar.bz2
yuzu-cedbe925cdff42b8eb4671f7de490cbdc0ebd780.tar.lz
yuzu-cedbe925cdff42b8eb4671f7de490cbdc0ebd780.tar.xz
yuzu-cedbe925cdff42b8eb4671f7de490cbdc0ebd780.tar.zst
yuzu-cedbe925cdff42b8eb4671f7de490cbdc0ebd780.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/engines/const_buffer_engine_interface.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/video_core/engines/const_buffer_engine_interface.h b/src/video_core/engines/const_buffer_engine_interface.h
index 724ee0fd6..ebe139504 100644
--- a/src/video_core/engines/const_buffer_engine_interface.h
+++ b/src/video_core/engines/const_buffer_engine_interface.h
@@ -18,10 +18,14 @@ struct SamplerDescriptor {
union {
u32 raw = 0;
BitField<0, 2, Tegra::Shader::TextureType> texture_type;
- BitField<2, 3, Tegra::Texture::ComponentType> component_type;
+ BitField<2, 3, Tegra::Texture::ComponentType> r_type;
BitField<5, 1, u32> is_array;
BitField<6, 1, u32> is_buffer;
BitField<7, 1, u32> is_shadow;
+ BitField<8, 3, Tegra::Texture::ComponentType> g_type;
+ BitField<11, 3, Tegra::Texture::ComponentType> b_type;
+ BitField<14, 3, Tegra::Texture::ComponentType> a_type;
+ BitField<17, 7, Tegra::Texture::TextureFormat> format;
};
bool operator==(const SamplerDescriptor& rhs) const noexcept {
@@ -36,9 +40,11 @@ struct SamplerDescriptor {
using Tegra::Shader::TextureType;
SamplerDescriptor result;
- // This is going to be used to determine the shading language type.
- // Because of that we don't care about all component types on color textures.
- result.component_type.Assign(tic.r_type.Value());
+ result.format.Assign(tic.format.Value());
+ result.r_type.Assign(tic.r_type.Value());
+ result.g_type.Assign(tic.g_type.Value());
+ result.b_type.Assign(tic.b_type.Value());
+ result.a_type.Assign(tic.a_type.Value());
switch (tic.texture_type.Value()) {
case Tegra::Texture::TextureType::Texture1D: