Fix promotion of floats to doubles

[mesa.git] / src / gallium / drivers / softpipe / sp_buffer.c

diff --git a/src/gallium/drivers/softpipe/sp_buffer.c b/src/gallium/drivers/softpipe/sp_buffer.c
index 69a6bd18c3bae6a1afa9db97b170ef65dddae2c6..99925c38042123ea46a088e3823a494bd64eccd2 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_buffer.c
+++ b/src/gallium/drivers/softpipe/sp_buffer.c
@@ -25,7 +25,7 @@
 #include "sp_buffer.h"
 #include "sp_texture.h"
 
-#include "util/u_format.h"
+#include "util/format/u_format.h"
 
 static bool
 get_dimensions(const struct pipe_shader_buffer *bview,
@@ -155,14 +155,14 @@ sp_tgsi_store(const struct tgsi_buffer *buffer,
  * Implement atomic operations on unsigned integers.
  */
 static void
-handle_op_uint(const struct pipe_shader_buffer *bview,
-               bool just_read,
-               unsigned char *data_ptr,
-               uint qi,
-               unsigned opcode,
-               unsigned writemask,
-               float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE],
-               float rgba2[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
+handle_op_atomic(const struct pipe_shader_buffer *bview,
+                 bool just_read,
+                 unsigned char *data_ptr,
+                 uint qi,
+                 enum tgsi_opcode opcode,
+                 unsigned writemask,
+                 float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE],
+                 float rgba2[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
 {
    uint c;
    const struct util_format_description *format_desc = util_format_description(PIPE_FORMAT_R32_UINT);
@@ -260,6 +260,13 @@ handle_op_uint(const struct pipe_shader_buffer *bview,
          ((uint32_t *)rgba[c])[qi] = dst_x;
       }
       break;
+   case TGSI_OPCODE_ATOMFADD:
+      for (c = 0; c < 4; c++) {
+         float temp = uif(sdata[c]);
+         sdata[c] = fui(temp + rgba[c][qi]);
+         rgba[c][qi] = temp;
+      }
+      break;
    default:
       assert(!"Unexpected TGSI opcode in sp_tgsi_op");
       break;
@@ -281,7 +288,7 @@ handle_op_uint(const struct pipe_shader_buffer *bview,
 static void
 sp_tgsi_op(const struct tgsi_buffer *buffer,
            const struct tgsi_buffer_params *params,
-           unsigned opcode,
+           enum tgsi_opcode opcode,
            const int s[TGSI_QUAD_SIZE],
            float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE],
            float rgba2[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
@@ -324,8 +331,8 @@ sp_tgsi_op(const struct tgsi_buffer *buffer,
       data_ptr = (unsigned char *)spr->data + bview->buffer_offset + s_coord;
       /* we should see atomic operations on r32 formats */
 
-      handle_op_uint(bview, just_read, data_ptr, j,
-                     opcode, params->writemask, rgba, rgba2);
+      handle_op_atomic(bview, just_read, data_ptr, j,
+                       opcode, params->writemask, rgba, rgba2);
    }
    return;
 fail_write_all_zero: