summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/rbug
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/auxiliary/rbug')
-rw-r--r--src/gallium/auxiliary/rbug/rbug_context.c90
-rw-r--r--src/gallium/auxiliary/rbug/rbug_context.h28
-rw-r--r--src/gallium/auxiliary/rbug/rbug_demarshal.c2
-rw-r--r--src/gallium/auxiliary/rbug/rbug_proto.h3
4 files changed, 122 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/rbug/rbug_context.c b/src/gallium/auxiliary/rbug/rbug_context.c
index 787f650f71..1832425658 100644
--- a/src/gallium/auxiliary/rbug/rbug_context.c
+++ b/src/gallium/auxiliary/rbug/rbug_context.c
@@ -233,6 +233,59 @@ int rbug_send_context_draw_unblock(struct rbug_connection *__con,
return __ret;
}
+int rbug_send_context_draw_rule(struct rbug_connection *__con,
+ rbug_context_t context,
+ rbug_shader_t vertex,
+ rbug_shader_t fragment,
+ rbug_texture_t texture,
+ rbug_texture_t surface,
+ rbug_block_t block,
+ uint32_t *__serial)
+{
+ uint32_t __len = 0;
+ uint32_t __pos = 0;
+ uint8_t *__data = NULL;
+ int __ret = 0;
+
+ LEN(8); /* header */
+ LEN(8); /* context */
+ LEN(8); /* vertex */
+ LEN(8); /* fragment */
+ LEN(8); /* texture */
+ LEN(8); /* surface */
+ LEN(4); /* block */
+
+ /* align */
+ PAD(__len, 8);
+
+ __data = (uint8_t*)MALLOC(__len);
+ if (!__data)
+ return -ENOMEM;
+
+ WRITE(4, int32_t, ((int32_t)RBUG_OP_CONTEXT_DRAW_RULE));
+ WRITE(4, uint32_t, ((uint32_t)(__len / 4)));
+ WRITE(8, rbug_context_t, context); /* context */
+ WRITE(8, rbug_shader_t, vertex); /* vertex */
+ WRITE(8, rbug_shader_t, fragment); /* fragment */
+ WRITE(8, rbug_texture_t, texture); /* texture */
+ WRITE(8, rbug_texture_t, surface); /* surface */
+ WRITE(4, rbug_block_t, block); /* block */
+
+ /* final pad */
+ PAD(__pos, 8);
+
+ if (__pos != __len) {
+ __ret = -EINVAL;
+ } else {
+ rbug_connection_send_start(__con, RBUG_OP_CONTEXT_DRAW_RULE, __len);
+ rbug_connection_write(__con, __data, __len);
+ __ret = rbug_connection_send_finish(__con, __serial);
+ }
+
+ FREE(__data);
+ return __ret;
+}
+
int rbug_send_context_flush(struct rbug_connection *__con,
rbug_context_t context,
int32_t flags,
@@ -320,6 +373,8 @@ int rbug_send_context_info_reply(struct rbug_connection *__con,
uint32_t serial,
rbug_shader_t vertex,
rbug_shader_t fragment,
+ rbug_texture_t *texs,
+ uint32_t texs_len,
rbug_texture_t *cbufs,
uint32_t cbufs_len,
rbug_texture_t zsbuf,
@@ -336,6 +391,7 @@ int rbug_send_context_info_reply(struct rbug_connection *__con,
LEN(4); /* serial */
LEN(8); /* vertex */
LEN(8); /* fragment */
+ LEN_ARRAY(8, texs); /* texs */
LEN_ARRAY(8, cbufs); /* cbufs */
LEN(8); /* zsbuf */
LEN(4); /* blocker */
@@ -353,6 +409,7 @@ int rbug_send_context_info_reply(struct rbug_connection *__con,
WRITE(4, uint32_t, serial); /* serial */
WRITE(8, rbug_shader_t, vertex); /* vertex */
WRITE(8, rbug_shader_t, fragment); /* fragment */
+ WRITE_ARRAY(8, rbug_texture_t, texs); /* texs */
WRITE_ARRAY(8, rbug_texture_t, cbufs); /* cbufs */
WRITE(8, rbug_texture_t, zsbuf); /* zsbuf */
WRITE(4, rbug_block_t, blocker); /* blocker */
@@ -551,6 +608,38 @@ struct rbug_proto_context_draw_unblock * rbug_demarshal_context_draw_unblock(str
return ret;
}
+struct rbug_proto_context_draw_rule * rbug_demarshal_context_draw_rule(struct rbug_proto_header *header)
+{
+ uint32_t len = 0;
+ uint32_t pos = 0;
+ uint8_t *data = NULL;
+ struct rbug_proto_context_draw_rule *ret;
+
+ if (!header)
+ return NULL;
+ if (header->opcode != (int16_t)RBUG_OP_CONTEXT_DRAW_RULE)
+ return NULL;
+
+ pos = 0;
+ len = header->length * 4;
+ data = (uint8_t*)&header[1];
+ ret = MALLOC(sizeof(*ret));
+ if (!ret)
+ return NULL;
+
+ ret->header.__message = header;
+ ret->header.opcode = header->opcode;
+
+ READ(8, rbug_context_t, context); /* context */
+ READ(8, rbug_shader_t, vertex); /* vertex */
+ READ(8, rbug_shader_t, fragment); /* fragment */
+ READ(8, rbug_texture_t, texture); /* texture */
+ READ(8, rbug_texture_t, surface); /* surface */
+ READ(4, rbug_block_t, block); /* block */
+
+ return ret;
+}
+
struct rbug_proto_context_flush * rbug_demarshal_context_flush(struct rbug_proto_header *header)
{
uint32_t len = 0;
@@ -632,6 +721,7 @@ struct rbug_proto_context_info_reply * rbug_demarshal_context_info_reply(struct
READ(4, uint32_t, serial); /* serial */
READ(8, rbug_shader_t, vertex); /* vertex */
READ(8, rbug_shader_t, fragment); /* fragment */
+ READ_ARRAY(8, rbug_texture_t, texs); /* texs */
READ_ARRAY(8, rbug_texture_t, cbufs); /* cbufs */
READ(8, rbug_texture_t, zsbuf); /* zsbuf */
READ(4, rbug_block_t, blocker); /* blocker */
diff --git a/src/gallium/auxiliary/rbug/rbug_context.h b/src/gallium/auxiliary/rbug/rbug_context.h
index 9f1726d64d..da61c2365b 100644
--- a/src/gallium/auxiliary/rbug/rbug_context.h
+++ b/src/gallium/auxiliary/rbug/rbug_context.h
@@ -45,6 +45,8 @@ typedef enum
{
RBUG_BLOCK_BEFORE = 1,
RBUG_BLOCK_AFTER = 2,
+ RBUG_BLOCK_RULE = 4,
+ RBUG_BLOCK_MASK = 7,
} rbug_block_t;
struct rbug_proto_context_list
@@ -79,6 +81,17 @@ struct rbug_proto_context_draw_unblock
rbug_block_t unblock;
};
+struct rbug_proto_context_draw_rule
+{
+ struct rbug_header header;
+ rbug_context_t context;
+ rbug_shader_t vertex;
+ rbug_shader_t fragment;
+ rbug_texture_t texture;
+ rbug_texture_t surface;
+ rbug_block_t block;
+};
+
struct rbug_proto_context_flush
{
struct rbug_header header;
@@ -100,6 +113,8 @@ struct rbug_proto_context_info_reply
uint32_t serial;
rbug_shader_t vertex;
rbug_shader_t fragment;
+ rbug_texture_t *texs;
+ uint32_t texs_len;
rbug_texture_t *cbufs;
uint32_t cbufs_len;
rbug_texture_t zsbuf;
@@ -136,6 +151,15 @@ int rbug_send_context_draw_unblock(struct rbug_connection *__con,
rbug_block_t unblock,
uint32_t *__serial);
+int rbug_send_context_draw_rule(struct rbug_connection *__con,
+ rbug_context_t context,
+ rbug_shader_t vertex,
+ rbug_shader_t fragment,
+ rbug_texture_t texture,
+ rbug_texture_t surface,
+ rbug_block_t block,
+ uint32_t *__serial);
+
int rbug_send_context_flush(struct rbug_connection *__con,
rbug_context_t context,
int32_t flags,
@@ -151,6 +175,8 @@ int rbug_send_context_info_reply(struct rbug_connection *__con,
uint32_t serial,
rbug_shader_t vertex,
rbug_shader_t fragment,
+ rbug_texture_t *texs,
+ uint32_t texs_len,
rbug_texture_t *cbufs,
uint32_t cbufs_len,
rbug_texture_t zsbuf,
@@ -173,6 +199,8 @@ struct rbug_proto_context_draw_step * rbug_demarshal_context_draw_step(struct rb
struct rbug_proto_context_draw_unblock * rbug_demarshal_context_draw_unblock(struct rbug_proto_header *header);
+struct rbug_proto_context_draw_rule * rbug_demarshal_context_draw_rule(struct rbug_proto_header *header);
+
struct rbug_proto_context_flush * rbug_demarshal_context_flush(struct rbug_proto_header *header);
struct rbug_proto_context_list_reply * rbug_demarshal_context_list_reply(struct rbug_proto_header *header);
diff --git a/src/gallium/auxiliary/rbug/rbug_demarshal.c b/src/gallium/auxiliary/rbug/rbug_demarshal.c
index 80894f4a64..47390fbcee 100644
--- a/src/gallium/auxiliary/rbug/rbug_demarshal.c
+++ b/src/gallium/auxiliary/rbug/rbug_demarshal.c
@@ -65,6 +65,8 @@ struct rbug_header * rbug_demarshal(struct rbug_proto_header *header)
return (struct rbug_header *)rbug_demarshal_context_draw_step(header);
case RBUG_OP_CONTEXT_DRAW_UNBLOCK:
return (struct rbug_header *)rbug_demarshal_context_draw_unblock(header);
+ case RBUG_OP_CONTEXT_DRAW_RULE:
+ return (struct rbug_header *)rbug_demarshal_context_draw_rule(header);
case RBUG_OP_CONTEXT_FLUSH:
return (struct rbug_header *)rbug_demarshal_context_flush(header);
case RBUG_OP_CONTEXT_LIST_REPLY:
diff --git a/src/gallium/auxiliary/rbug/rbug_proto.h b/src/gallium/auxiliary/rbug/rbug_proto.h
index db9fa68500..d273be0166 100644
--- a/src/gallium/auxiliary/rbug/rbug_proto.h
+++ b/src/gallium/auxiliary/rbug/rbug_proto.h
@@ -55,7 +55,8 @@ enum rbug_opcode
RBUG_OP_CONTEXT_DRAW_BLOCK = 514,
RBUG_OP_CONTEXT_DRAW_STEP = 515,
RBUG_OP_CONTEXT_DRAW_UNBLOCK = 516,
- RBUG_OP_CONTEXT_FLUSH = 518,
+ RBUG_OP_CONTEXT_DRAW_RULE = 518,
+ RBUG_OP_CONTEXT_FLUSH = 519,
RBUG_OP_CONTEXT_LIST_REPLY = -512,
RBUG_OP_CONTEXT_INFO_REPLY = -513,
RBUG_OP_CONTEXT_DRAW_BLOCKED = 517,
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 22:01:10 +0000