fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SPIR-V] Fix 1D texture fetches. Fixes #1124

Browse Source
This commit is contained in:
DrChat
2018-04-20 15:24:42 -05:00
parent 2b66a1b68f
commit 86f387ed42
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/xenia/gpu/spirv_shader_translator.cc
View File

@@ -1795,6 +1795,12 @@ void SpirvShaderTranslator::ProcessTextureFetchInstruction(
tex_[dim_idx], std::vector<Id>({texture_index})); tex_[dim_idx], std::vector<Id>({texture_index}));
auto texture = b.createLoad(texture_ptr); auto texture = b.createLoad(texture_ptr);
if (instr.dimension == TextureDimension::k1D) {
// Upgrade 1D src coordinate into 2D
src = b.createCompositeConstruct(vec2_float_type_,
{src, b.makeFloatConstant(0.f)});
}
spv::Builder::TextureParameters params = {0}; spv::Builder::TextureParameters params = {0};
params.coords = src; params.coords = src;
params.sampler = texture; params.sampler = texture;
@@ -1917,6 +1923,12 @@ void SpirvShaderTranslator::ProcessTextureFetchInstruction(
tex_[dim_idx], std::vector<Id>({texture_index})); tex_[dim_idx], std::vector<Id>({texture_index}));
auto texture = b.createLoad(texture_ptr); auto texture = b.createLoad(texture_ptr);
if (instr.dimension == TextureDimension::k1D) {
// Upgrade 1D src coordinate into 2D
src = b.createCompositeConstruct(vec2_float_type_,
{src, b.makeFloatConstant(0.f)});
}
spv::Builder::TextureParameters params = {}; spv::Builder::TextureParameters params = {};
params.sampler = texture; params.sampler = texture;
params.coords = src; params.coords = src;

2
src/xenia/gpu/spirv_shader_translator.h
View File

@@ -29,7 +29,7 @@ namespace gpu {
// supported size). // supported size).
struct SpirvPushConstants { struct SpirvPushConstants {
// Accessible to vertex shader only: // Accessible to vertex shader only:
float window_scale[4]; // scale x/y, viewport width/height (pixels) float window_scale[4]; // scale x/y, offset x/y (pixels)
float vtx_fmt[4]; float vtx_fmt[4];
// Accessible to geometry shader only: // Accessible to geometry shader only: