The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-06-14 14:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixup ReadTextureType shader compiler callback

Browse Source
This commit is contained in:
Billy Laws 2022-10-30 16:22:31 +00:00
parent b04d18eba5
commit 579fd04117
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_manager.cpp
View File

@ -9,6 +9,15 @@
#include "pipeline_manager.h"
namespace skyline::gpu::interconnect::maxwell3d {
union BindlessHandle {
u32 raw;
struct {
u32 textureIndex : 20;
u32 samplerIndex : 12;
};
};
static constexpr Shader::Stage ConvertCompilerShaderStage(engine::Pipeline::Shader::Type stage) {
switch (stage) {
case engine::Pipeline::Shader::Type::VertexCullBeforeFetch:
@ -193,7 +202,7 @@ namespace skyline::gpu::interconnect::maxwell3d {
size_t shaderStage{i > 0 ? (i - 1) : 0};
return constantBuffers[shaderStage][index].Read<int>(ctx.executor, offset);
}, [&](u32 index) {
return textures.GetTextureType(ctx, index);
return textures.GetTextureType(ctx, BindlessHandle{ .raw = index }.textureIndex);
})};
if (i == stageIdx(PipelineStage::Vertex) && packedState.shaderHashes[stageIdx(PipelineStage::VertexCullBeforeFetch)]) {
ignoreVertexCullBeforeFetch = true;
@ -657,15 +666,6 @@ namespace skyline::gpu::interconnect::maxwell3d {
return view;
}
union BindlessHandle {
u32 raw;
struct {
u32 textureIndex : 20;
u32 samplerIndex : 12;
};
};
static BindlessHandle ReadBindlessHandle(InterconnectContext &ctx, std::array<ConstantBuffer, engine::ShaderStageConstantBufferCount> &constantBuffers, const auto &desc, size_t arrayIdx) {
ConstantBuffer &primaryCbuf{constantBuffers[desc.cbuf_index]};
size_t elemOffset{arrayIdx << desc.size_shift};