GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-29 15:05:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implement ReadCbufValue and ReadTextureType hades callbacks

Browse Source 
Used for bindless and BRX instruction emulation.
This commit is contained in:
Billy Laws 2022-10-09 13:50:19 +01:00
parent 2163f8cde6
commit 4c2db0ba01
3 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,11 +184,17 @@ namespace skyline::gpu::interconnect::maxwell3d {
if (!packedState.shaderHashes[i])
continue;
auto program{ctx.gpu.shader.ParseGraphicsShader(packedState.postVtgShaderAttributeSkipMask,
ConvertCompilerShaderStage(static_cast<PipelineStage>(i)),
shaderBinaries[i].binary, shaderBinaries[i].baseOffset,
packedState.bindlessTextureConstantBufferSlotSelect,
[](int, int){ return 0; }, [](u32){return Shader::TextureType::Color2D;})};
auto program{ctx.gpu.shader.ParseGraphicsShader(
packedState.postVtgShaderAttributeSkipMask,
ConvertCompilerShaderStage(static_cast<PipelineStage>(i)),
shaderBinaries[i].binary, shaderBinaries[i].baseOffset,
packedState.bindlessTextureConstantBufferSlotSelect,
[&](u32 index, u32 offset) {
size_t shaderStage{i > 0 ? (i - 1) : 0};
return constantBuffers[shaderStage][index].Read<int>(ctx.executor, offset);
}, [&](u32 index) {
return textures.GetTextureType(ctx, index);
})};
if (i == stageIdx(PipelineStage::Vertex) && packedState.shaderHashes[stageIdx(PipelineStage::VertexCullBeforeFetch)]) {
ignoreVertexCullBeforeFetch = true;
programs[i] = ctx.gpu.shader.CombineVertexShaders(programs[stageIdx(PipelineStage::VertexCullBeforeFetch)], program, shaderBinaries[i].binary);

23
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/textures.cpp
View File

@ -318,4 +318,27 @@ namespace skyline::gpu::interconnect::maxwell3d {
textureHeaderCache[index] = {textureHeader, texture.get(), ctx.executor.executionNumber};
return texture.get();
}
Shader::TextureType Textures::GetTextureType(InterconnectContext &ctx, u32 index) {
auto textureHeaders{texturePool.UpdateGet(ctx).textureHeaders};
switch (textureHeaders[index].textureType) {
case TextureImageControl::TextureType::e1D:
return Shader::TextureType::Color1D;
case TextureImageControl::TextureType::e1DArray:
return Shader::TextureType::ColorArray1D;
case TextureImageControl::TextureType::e1DBuffer:
return Shader::TextureType::Buffer;
case TextureImageControl::TextureType::e2DNoMipmap:
case TextureImageControl::TextureType::e2D:
return Shader::TextureType::Color2D;
case TextureImageControl::TextureType::e2DArray:
return Shader::TextureType::ColorArray2D;
case TextureImageControl::TextureType::e3D:
return Shader::TextureType::Color3D;
case TextureImageControl::TextureType::eCube:
return Shader::TextureType::ColorCube;
case TextureImageControl::TextureType::eCubeArray:
return Shader::TextureType::ColorArrayCube;
}
}
}

1
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/textures.h
View File

@ -4,6 +4,7 @@
#pragma once
#include <tsl/robin_map.h>
#include <shader_compiler/runtime_info.h>
#include "common.h"
#include "tic.h"