glsl: Address Rodrigo's feedback

1 files changed, 19 insertions, 19 deletions

diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_convert.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_convert.cpp
index 8d823e466..777e290b4 100644
--- a/src/shader_recompiler/backend/glsl/emit_glsl_convert.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_convert.cpp
@@ -15,7 +15,7 @@ void EmitConvertS16F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::I
 }
 
 void EmitConvertS16F32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddS32("{}=int(float({}))&0xffff;", inst, value);
+    ctx.AddS32("{}=(int({})&0xffff)|(bitfieldExtract(int({}),31,1)<<15);", inst, value, value);
 }
 
 void EmitConvertS16F64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -29,11 +29,11 @@ void EmitConvertS32F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::I
 }
 
 void EmitConvertS32F32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddS32("{}=int(float({}));", inst, value);
+    ctx.AddS32("{}=int({});", inst, value);
 }
 
 void EmitConvertS32F64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddS32("{}=int(double({}));", inst, value);
+    ctx.AddS32("{}=int({});", inst, value);
 }
 
 void EmitConvertS64F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -42,11 +42,11 @@ void EmitConvertS64F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::I
 }
 
 void EmitConvertS64F32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddS64("{}=int64_t(double(float({})));", inst, value);
+    ctx.AddS64("{}=int64_t(double({}));", inst, value);
 }
 
 void EmitConvertS64F64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddS64("{}=int64_t(double({}));", inst, value);
+    ctx.AddS64("{}=int64_t({});", inst, value);
 }
 
 void EmitConvertU16F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -70,11 +70,11 @@ void EmitConvertU32F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::I
 }
 
 void EmitConvertU32F32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddU32("{}=uint(float({}));", inst, value);
+    ctx.AddU32("{}=uint({});", inst, value);
 }
 
 void EmitConvertU32F64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddU32("{}=uint(double({}));", inst, value);
+    ctx.AddU32("{}=uint({});", inst, value);
 }
 
 void EmitConvertU64F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -83,19 +83,19 @@ void EmitConvertU64F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::I
 }
 
 void EmitConvertU64F32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddU64("{}=uint64_t(float({}));", inst, value);
+    ctx.AddU64("{}=uint64_t({});", inst, value);
 }
 
 void EmitConvertU64F64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddU64("{}=uint64_t(double({}));", inst, value);
+    ctx.AddU64("{}=uint64_t({});", inst, value);
 }
 
 void EmitConvertU64U32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddU64("{}=uint64_t(uint({}));", inst, value);
+    ctx.AddU64("{}=uint64_t({});", inst, value);
 }
 
 void EmitConvertU32U64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddU32("{}=uint(uint64_t({}));", inst, value);
+    ctx.AddU32("{}=uint({});", inst, value);
 }
 
 void EmitConvertF16F32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -109,11 +109,11 @@ void EmitConvertF32F16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::I
 }
 
 void EmitConvertF32F64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddF32("{}=float(double({}));", inst, value);
+    ctx.AddF32("{}=float({});", inst, value);
 }
 
 void EmitConvertF64F32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddF64("{}=double(float({}));", inst, value);
+    ctx.AddF64("{}=double({});", inst, value);
 }
 
 void EmitConvertF16S8([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -171,7 +171,7 @@ void EmitConvertF32S32(EmitContext& ctx, IR::Inst& inst, std::string_view value)
 }
 
 void EmitConvertF32S64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddF32("{}=float(double(int64_t({})));", inst, value);
+    ctx.AddF32("{}=float(int64_t({}));", inst, value);
 }
 
 void EmitConvertF32U8([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -180,15 +180,15 @@ void EmitConvertF32U8([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::In
 }
 
 void EmitConvertF32U16(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddF32("{}=float(uint({}&0xffff));", inst, value);
+    ctx.AddF32("{}=float({}&0xffff);", inst, value);
 }
 
 void EmitConvertF32U32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddF32("{}=float(uint({}));", inst, value);
+    ctx.AddF32("{}=float({});", inst, value);
 }
 
 void EmitConvertF32U64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddF32("{}=float(double(uint64_t({})));", inst, value);
+    ctx.AddF32("{}=float({});", inst, value);
 }
 
 void EmitConvertF64S8([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -220,11 +220,11 @@ void EmitConvertF64U16([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::I
 }
 
 void EmitConvertF64U32(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddF64("{}=double(uint({}));", inst, value);
+    ctx.AddF64("{}=double({});", inst, value);
 }
 
 void EmitConvertF64U64(EmitContext& ctx, IR::Inst& inst, std::string_view value) {
-    ctx.AddF64("{}=double(uint64_t({}));", inst, value);
+    ctx.AddF64("{}=double({});", inst, value);
 }
 
 } // namespace Shader::Backend::GLSL