nak/sph: Stop storing the shader model in ShaderProgramHeader

It's only needed for one Kepler+ check which is unlikely to ever be
relevant for NAK.  Also, that should probably be based on the SPH
version or something, not an arbitrary shader model.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30141>
This commit is contained in:
Faith Ekstrand
2024-07-09 09:29:45 -05:00
committed by Marge Bot
parent c2d1e10315
commit d82a5d0f59
+6 -10
View File
@@ -73,7 +73,6 @@ impl From<PixelImap> for u8 {
pub struct ShaderProgramHeader {
pub data: [u32; CURRENT_MAX_SHADER_HEADER_SIZE],
shader_type: ShaderType,
sm: u8,
}
impl BitViewable for ShaderProgramHeader {
@@ -103,7 +102,6 @@ impl ShaderProgramHeader {
let mut res = Self {
data: [0; CURRENT_MAX_SHADER_HEADER_SIZE],
shader_type,
sm,
};
let sph_type = if shader_type == ShaderType::Fragment {
@@ -281,14 +279,12 @@ impl ShaderProgramHeader {
per_patch_attribute_count,
);
// Maxwell changed that encoding.
if self.sm > 35 {
self.set_field(
SPHV3_T1_RESERVED_COMMON_B,
per_patch_attribute_count & 0xf,
);
self.set_field(148..152, per_patch_attribute_count >> 4);
}
// This is Kepler+
self.set_field(
SPHV3_T1_RESERVED_COMMON_B,
per_patch_attribute_count & 0xf,
);
self.set_field(148..152, per_patch_attribute_count >> 4);
}
#[inline]