raphiaura/KytyPS5
1
0
Fork 0
mirror of https://github.com/KytyPS5/KytyPS5.git synced 2026-10-20 02:47:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "shader: separate comparison image bindings"

Browse Source 
This reverts commit d762d24f73.
This commit is contained in:
nmzik
2026-09-04 03:09:00 +02:00
parent 81b0c1302d
commit dd9ecd5f65
4 changed files with 26 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics/shader/recompiler/backend/spirv/spirvEmitterAnalysis.cpp
+1 -2
View File
@@ -158,8 +158,7 @@ uint32_t ImageType(EmitterState& state, const IR::ImageResource& image) {
}
const auto& info = ImageDimensionInfoFor(image.dimension);
return state.builder.Type(OpTypeImage,
{ImageScalarType(state, image.numeric_class), info.spirv_dimension,
image.depth_compare ? 1u : 0u,
{ImageScalarType(state, image.numeric_class), info.spirv_dimension, 0,
info.arrayed, info.multisampled, sampled, format});
}
src/graphics/shader/recompiler/ir/ShaderIR.h
+14 -23
View File
@@ -253,10 +253,9 @@ struct StageOutput {
bool operator==(const StageOutput& other) const = default;
};
inline constexpr uint32_t FirstImageBinding = 1u;
inline constexpr uint32_t FirstDepthComparisonImageBinding = 22u;
inline constexpr uint32_t FirstStorageImageBinding = 29u;
inline constexpr uint32_t ImageBindingCount = 43u;
inline constexpr uint32_t FirstImageBinding = 1u;
inline constexpr uint32_t FirstStorageImageBinding = 22u;
inline constexpr uint32_t ImageBindingCount = 36u;
enum class DescriptorBindingKind : uint32_t {
Buffers = 0u,
@@ -269,8 +268,8 @@ enum class DescriptorBindingKind : uint32_t {
Count,
};
static_assert(static_cast<uint32_t>(DescriptorBindingKind::Samplers) == 44u);
static_assert(static_cast<uint32_t>(DescriptorBindingKind::Count) == 50u);
static_assert(static_cast<uint32_t>(DescriptorBindingKind::Samplers) == 37u);
static_assert(static_cast<uint32_t>(DescriptorBindingKind::Count) == 43u);
struct PushData {
static constexpr uint32_t DwordCount = 32;
@@ -314,10 +313,9 @@ DescriptorBindingForImage(const ImageResource& image) {
constexpr uint32_t SampledFloatBinding = 1u;
constexpr uint32_t SampledUintBinding = 8u;
constexpr uint32_t SampledSintBinding = 15u;
constexpr uint32_t SampledDepthBinding = FirstDepthComparisonImageBinding;
constexpr uint32_t StorageFloatBinding = FirstStorageImageBinding;
constexpr uint32_t StorageUintBinding = 34u;
constexpr uint32_t AtomicUintBinding = 39u;
constexpr uint32_t StorageFloatBinding = 22u;
constexpr uint32_t StorageUintBinding = 27u;
constexpr uint32_t AtomicUintBinding = 32u;
uint32_t base = 0;
bool sampled = false;
@@ -326,19 +324,12 @@ DescriptorBindingForImage(const ImageResource& image) {
return std::nullopt;
}
sampled = true;
if (image.depth_compare) {
if (image.numeric_class != Prospero::TextureNumericClass::Float) {
return std::nullopt;
}
base = SampledDepthBinding;
} else {
switch (image.numeric_class) {
case Prospero::TextureNumericClass::Float: base = SampledFloatBinding; break;
case Prospero::TextureNumericClass::Uint: base = SampledUintBinding; break;
case Prospero::TextureNumericClass::Sint: base = SampledSintBinding; break;
case Prospero::TextureNumericClass::Unsupported: return std::nullopt;
default: return std::nullopt;
}
switch (image.numeric_class) {
case Prospero::TextureNumericClass::Float: base = SampledFloatBinding; break;
case Prospero::TextureNumericClass::Uint: base = SampledUintBinding; break;
case Prospero::TextureNumericClass::Sint: base = SampledSintBinding; break;
case Prospero::TextureNumericClass::Unsupported: return std::nullopt;
default: return std::nullopt;
}
} else if (image.resource_class == ImageResourceClass::Storage) {
if (image.atomic) {