diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp index 50d9cc8c..8f062d6e 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp @@ -76,77 +76,89 @@ Id EmitImageSampleImplicitLod(EmitContext& ctx, IR::Inst* inst, u32 handle, Id c const IR::Value& offset) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); + const Id result_type = texture.data_types->Get(4); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); const Id sampled_image = ctx.OpSampledImage(texture.sampled_type, image, sampler); ImageOperands operands; operands.Add(spv::ImageOperandsMask::Bias, bias); operands.AddOffset(ctx, offset); - return ctx.OpImageSampleImplicitLod(ctx.F32[4], sampled_image, coords, operands.mask, - operands.operands); + const Id sample = ctx.OpImageSampleImplicitLod(result_type, sampled_image, coords, + operands.mask, operands.operands); + return texture.is_integer ? ctx.OpBitcast(ctx.F32[4], sample) : sample; } Id EmitImageSampleExplicitLod(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id lod, const IR::Value& offset) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); + const Id result_type = texture.data_types->Get(4); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); const Id sampled_image = ctx.OpSampledImage(texture.sampled_type, image, sampler); ImageOperands operands; operands.Add(spv::ImageOperandsMask::Lod, lod); operands.AddOffset(ctx, offset); - return ctx.OpImageSampleExplicitLod(ctx.F32[4], sampled_image, coords, operands.mask, - operands.operands); + const Id sample = ctx.OpImageSampleExplicitLod(result_type, sampled_image, coords, + operands.mask, operands.operands); + return texture.is_integer ? ctx.OpBitcast(ctx.F32[4], sample) : sample; } Id EmitImageSampleDrefImplicitLod(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id dref, Id bias, const IR::Value& offset) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); + const Id result_type = texture.data_types->Get(1); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); const Id sampled_image = ctx.OpSampledImage(texture.sampled_type, image, sampler); ImageOperands operands; operands.Add(spv::ImageOperandsMask::Bias, bias); operands.AddOffset(ctx, offset); - return ctx.OpImageSampleDrefImplicitLod(ctx.F32[1], sampled_image, coords, dref, operands.mask, - operands.operands); + const Id sample = ctx.OpImageSampleDrefImplicitLod(result_type, sampled_image, coords, dref, + operands.mask, operands.operands); + return texture.is_integer ? ctx.OpBitcast(ctx.F32[1], sample) : sample; } Id EmitImageSampleDrefExplicitLod(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id dref, Id lod, const IR::Value& offset) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); + const Id result_type = texture.data_types->Get(1); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); const Id sampled_image = ctx.OpSampledImage(texture.sampled_type, image, sampler); ImageOperands operands; operands.AddOffset(ctx, offset); operands.Add(spv::ImageOperandsMask::Lod, lod); - return ctx.OpImageSampleDrefExplicitLod(ctx.F32[1], sampled_image, coords, dref, operands.mask, - operands.operands); + const Id sample = ctx.OpImageSampleDrefExplicitLod(result_type, sampled_image, coords, dref, + operands.mask, operands.operands); + return texture.is_integer ? ctx.OpBitcast(ctx.F32[1], sample) : sample; } Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, const IR::Value& offset) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); + const Id result_type = texture.data_types->Get(4); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); const Id sampled_image = ctx.OpSampledImage(texture.sampled_type, image, sampler); const u32 comp = inst->Flags().gather_comp.Value(); ImageOperands operands; operands.AddOffset(ctx, offset, true); - return ctx.OpImageGather(ctx.F32[4], sampled_image, coords, ctx.ConstU32(comp), operands.mask, - operands.operands); + const Id texels = ctx.OpImageGather(result_type, sampled_image, coords, ctx.ConstU32(comp), + operands.mask, operands.operands); + return texture.is_integer ? ctx.OpBitcast(ctx.F32[4], texels) : texels; } Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, const IR::Value& offset, Id dref) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); + const Id result_type = texture.data_types->Get(4); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); const Id sampled_image = ctx.OpSampledImage(texture.sampled_type, image, sampler); ImageOperands operands; operands.AddOffset(ctx, offset, true); - return ctx.OpImageDrefGather(ctx.F32[4], sampled_image, coords, dref, operands.mask, - operands.operands); + const Id texels = ctx.OpImageDrefGather(result_type, sampled_image, coords, dref, operands.mask, + operands.operands); + return texture.is_integer ? ctx.OpBitcast(ctx.F32[4], texels) : texels; } Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, const IR::Value& offset, @@ -161,7 +173,7 @@ Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, const texture.is_storage ? ctx.OpImageRead(result_type, image, coords, operands.mask, operands.operands) : ctx.OpImageFetch(result_type, image, coords, operands.mask, operands.operands); - return ctx.OpBitcast(ctx.F32[4], texel); + return texture.is_integer ? ctx.OpBitcast(ctx.F32[4], texel) : texel; } Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, u32 handle, Id lod, bool has_mips) { @@ -204,13 +216,15 @@ Id EmitImageGradient(EmitContext& ctx, IR::Inst* inst, u32 handle, Id coords, Id const IR::Value& offset, Id lod_clamp) { const auto& texture = ctx.images[handle & 0xFFFF]; const Id image = ctx.OpLoad(texture.image_type, texture.id); + const Id result_type = texture.data_types->Get(4); const Id sampler = ctx.OpLoad(ctx.sampler_type, ctx.samplers[handle >> 16]); const Id sampled_image = ctx.OpSampledImage(texture.sampled_type, image, sampler); ImageOperands operands; operands.AddDerivatives(ctx, derivatives); operands.AddOffset(ctx, offset); - return ctx.OpImageSampleExplicitLod(ctx.F32[4], sampled_image, coords, operands.mask, - operands.operands); + const Id sample = ctx.OpImageSampleExplicitLod(result_type, sampled_image, coords, + operands.mask, operands.operands); + return texture.is_integer ? ctx.OpBitcast(ctx.F32[4], sample) : sample; } Id EmitImageRead(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords) { diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index dd780622..b66f0966 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp @@ -532,6 +532,8 @@ Id ImageType(EmitContext& ctx, const ImageResource& desc, Id sampled_type) { void EmitContext::DefineImagesAndSamplers() { for (const auto& image_desc : info.images) { + const bool is_integer = image_desc.nfmt == AmdGpu::NumberFormat::Uint || + image_desc.nfmt == AmdGpu::NumberFormat::Sint; const VectorIds& data_types = GetAttributeType(*this, image_desc.nfmt); const Id sampled_type = data_types[1]; const Id image_type{ImageType(*this, image_desc, sampled_type)}; @@ -547,6 +549,7 @@ void EmitContext::DefineImagesAndSamplers() { .sampled_type = image_desc.is_storage ? sampled_type : TypeSampledImage(image_type), .pointer_type = pointer_type, .image_type = image_type, + .is_integer = is_integer, .is_storage = image_desc.is_storage, }); interfaces.push_back(id); diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h index 9029866b..fb7b29b3 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h @@ -201,6 +201,7 @@ public: Id sampled_type; Id pointer_type; Id image_type; + bool is_integer = false; bool is_storage = false; };