franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spirv/convert: Catch more signed operations oversights 

The sign bit on integers of size < 32 was not properly preserved in casts
This commit is contained in:
ameerj 2021-06-11 01:11:59 -04:00
parent 8554a644df
commit d52bacf6f0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/shader_recompiler/backend/spirv/emit_spirv_convert.cpp
View File

@ -17,14 +17,14 @@ Id ExtractU16(EmitContext& ctx, Id value) {
Id ExtractS16(EmitContext& ctx, Id value) { Id ExtractS16(EmitContext& ctx, Id value) {
if (ctx.profile.support_int16) { if (ctx.profile.support_int16) {
return ctx.OpUConvert(ctx.S16, value); return ctx.OpSConvert(ctx.S16, value);
} else { } else {
return ctx.OpBitFieldSExtract(ctx.U32[1], value, ctx.u32_zero_value, ctx.Const(16u)); return ctx.OpBitFieldSExtract(ctx.U32[1], value, ctx.u32_zero_value, ctx.Const(16u));
} }
} }
Id ExtractU8(EmitContext& ctx, Id value) { Id ExtractU8(EmitContext& ctx, Id value) {
if (ctx.profile.support_int16) { if (ctx.profile.support_int8) {
return ctx.OpUConvert(ctx.U8, value); return ctx.OpUConvert(ctx.U8, value);
} else { } else {
return ctx.OpBitFieldUExtract(ctx.U32[1], value, ctx.u32_zero_value, ctx.Const(8u)); return ctx.OpBitFieldUExtract(ctx.U32[1], value, ctx.u32_zero_value, ctx.Const(8u));
@ -42,7 +42,7 @@ Id ExtractS8(EmitContext& ctx, Id value) {
Id EmitConvertS16F16(EmitContext& ctx, Id value) { Id EmitConvertS16F16(EmitContext& ctx, Id value) {
if (ctx.profile.support_int16) { if (ctx.profile.support_int16) {
return ctx.OpUConvert(ctx.U32[1], ctx.OpConvertFToS(ctx.U16, value)); return ctx.OpSConvert(ctx.U32[1], ctx.OpConvertFToS(ctx.U16, value));
} else { } else {
return ExtractS16(ctx, ctx.OpConvertFToS(ctx.U32[1], value)); return ExtractS16(ctx, ctx.OpConvertFToS(ctx.U32[1], value));
} }
@ -50,7 +50,7 @@ Id EmitConvertS16F16(EmitContext& ctx, Id value) {
Id EmitConvertS16F32(EmitContext& ctx, Id value) { Id EmitConvertS16F32(EmitContext& ctx, Id value) {
if (ctx.profile.support_int16) { if (ctx.profile.support_int16) {
return ctx.OpUConvert(ctx.U32[1], ctx.OpConvertFToS(ctx.U16, value)); return ctx.OpSConvert(ctx.U32[1], ctx.OpConvertFToS(ctx.U16, value));
} else { } else {
return ExtractS16(ctx, ctx.OpConvertFToS(ctx.U32[1], value)); return ExtractS16(ctx, ctx.OpConvertFToS(ctx.U32[1], value));
} }
@ -58,7 +58,7 @@ Id EmitConvertS16F32(EmitContext& ctx, Id value) {
Id EmitConvertS16F64(EmitContext& ctx, Id value) { Id EmitConvertS16F64(EmitContext& ctx, Id value) {
if (ctx.profile.support_int16) { if (ctx.profile.support_int16) {
return ctx.OpUConvert(ctx.U32[1], ctx.OpConvertFToS(ctx.U16, value)); return ctx.OpSConvert(ctx.U32[1], ctx.OpConvertFToS(ctx.U16, value));
} else { } else {
return ExtractS16(ctx, ctx.OpConvertFToS(ctx.U32[1], value)); return ExtractS16(ctx, ctx.OpConvertFToS(ctx.U32[1], value));
} }