|
|
@ -35,9 +35,9 @@ constexpr bool IsSchedInstruction(u32 offset, u32 main_offset) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void DeduceTextureHandlerSize(VideoCore::GuestDriverProfile* gpu_driver,
|
|
|
|
void DeduceTextureHandlerSize(VideoCore::GuestDriverProfile* gpu_driver,
|
|
|
|
std::list<Sampler>& used_samplers) {
|
|
|
|
const std::list<Sampler>& used_samplers) {
|
|
|
|
if (gpu_driver == nullptr) {
|
|
|
|
if (gpu_driver == nullptr) {
|
|
|
|
LOG_CRITICAL(HW_GPU, "GPU Driver profile has not been created yet");
|
|
|
|
LOG_CRITICAL(HW_GPU, "GPU driver profile has not been created yet");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (gpu_driver->TextureHandlerSizeKnown() || used_samplers.size() <= 1) {
|
|
|
|
if (gpu_driver->TextureHandlerSizeKnown() || used_samplers.size() <= 1) {
|
|
|
@ -57,9 +57,9 @@ void DeduceTextureHandlerSize(VideoCore::GuestDriverProfile* gpu_driver,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
std::optional<u32> TryDeduceSamplerSize(Sampler& sampler_to_deduce,
|
|
|
|
std::optional<u32> TryDeduceSamplerSize(const Sampler& sampler_to_deduce,
|
|
|
|
VideoCore::GuestDriverProfile* gpu_driver,
|
|
|
|
VideoCore::GuestDriverProfile* gpu_driver,
|
|
|
|
std::list<Sampler>& used_samplers) {
|
|
|
|
const std::list<Sampler>& used_samplers) {
|
|
|
|
if (gpu_driver == nullptr) {
|
|
|
|
if (gpu_driver == nullptr) {
|
|
|
|
LOG_CRITICAL(HW_GPU, "GPU Driver profile has not been created yet");
|
|
|
|
LOG_CRITICAL(HW_GPU, "GPU Driver profile has not been created yet");
|
|
|
|
return std::nullopt;
|
|
|
|
return std::nullopt;
|
|
|
@ -367,17 +367,18 @@ void ShaderIR::PostDecode() {
|
|
|
|
auto gpu_driver = locker.AccessGuestDriverProfile();
|
|
|
|
auto gpu_driver = locker.AccessGuestDriverProfile();
|
|
|
|
DeduceTextureHandlerSize(gpu_driver, used_samplers);
|
|
|
|
DeduceTextureHandlerSize(gpu_driver, used_samplers);
|
|
|
|
// Deduce Indexed Samplers
|
|
|
|
// Deduce Indexed Samplers
|
|
|
|
if (uses_indexed_samplers) {
|
|
|
|
if (!uses_indexed_samplers) {
|
|
|
|
for (auto& sampler : used_samplers) {
|
|
|
|
return;
|
|
|
|
if (sampler.IsIndexed()) {
|
|
|
|
}
|
|
|
|
auto size = TryDeduceSamplerSize(sampler, gpu_driver, used_samplers);
|
|
|
|
for (auto& sampler : used_samplers) {
|
|
|
|
if (size) {
|
|
|
|
if (!sampler.IsIndexed()) {
|
|
|
|
sampler.SetSize(*size);
|
|
|
|
continue;
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
LOG_CRITICAL(HW_GPU, "Failed to deduce size of indexed sampler");
|
|
|
|
if (const auto size = TryDeduceSamplerSize(sampler, gpu_driver, used_samplers)) {
|
|
|
|
sampler.SetSize(1);
|
|
|
|
sampler.SetSize(*size);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
}
|
|
|
|
LOG_CRITICAL(HW_GPU, "Failed to deduce size of indexed sampler");
|
|
|
|
|
|
|
|
sampler.SetSize(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|