gallium: remove TGSI opcodes PUSHA, POPA, SAD, TXQ_LZ

[mesa.git] / src / gallium / winsys / virgl / vtest / virgl_vtest_socket.c

diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
index 8fd6a510f700266a106a88b7760041362b0c523f..4541419d8e85a6f350df0ec8d9682ad310b4f77c 100644 (file)
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_socket.c
@@ -20,8 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "virgl_vtest_winsys.h"
-#include "virgl_vtest_public.h"
+
 #include <sys/socket.h>
 #include <errno.h>
 #include <stdio.h>
@@ -34,6 +33,9 @@
 /* connect to remote socket */
 #define VTEST_SOCKET_NAME "/tmp/.virgl_test"
 
+#include "virgl_vtest_winsys.h"
+#include "virgl_vtest_public.h"
+
 /* block read/write routines */
 static int virgl_block_write(int fd, void *buf, int size)
 {
@@ -60,7 +62,9 @@ static int virgl_block_read(int fd, void *buf, int size)
    do {
       ret = read(fd, ptr, left);
       if (ret <= 0) {
-         fprintf(stderr, "lost connection to rendering server on %d read %d %d\n", size, ret, errno);
+         fprintf(stderr,
+                 "lost connection to rendering server on %d read %d %d\n",
+                 size, ret, errno);
          abort();
          return ret < 0 ? -errno : 0;
       }
@@ -214,10 +218,12 @@ int virgl_vtest_send_transfer_cmd(struct virgl_vtest_winsys *vws,
 {
    uint32_t vtest_hdr[VTEST_HDR_SIZE];
    uint32_t cmd[VCMD_TRANSFER_HDR_SIZE];
-   bool is_put = (vcmd == VCMD_TRANSFER_PUT);
-   vtest_hdr[VTEST_CMD_LEN] = VCMD_TRANSFER_HDR_SIZE + (is_put ? (data_size + 3 / 4) : 0);
+   vtest_hdr[VTEST_CMD_LEN] = VCMD_TRANSFER_HDR_SIZE;
    vtest_hdr[VTEST_CMD_ID] = vcmd;
 
+   if (vcmd == VCMD_TRANSFER_PUT)
+      vtest_hdr[VTEST_CMD_LEN] += data_size + 3 / 4;
+
    cmd[0] = handle;
    cmd[1] = level;
    cmd[2] = stride;
@@ -246,9 +252,10 @@ int virgl_vtest_recv_transfer_get_data(struct virgl_vtest_winsys *vws,
                                        void *data,
                                        uint32_t data_size,
                                        uint32_t stride,
-                                       const struct pipe_box *box, uint32_t format)
+                                       const struct pipe_box *box,
+                                       uint32_t format)
 {
-   void *line = malloc(stride);
+   void *line;
    void *ptr = data;
    int hblocks = util_format_get_nblocksy(format, box->height);