AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llvmpipe: remove lp_rast_cmd_arg::state field

Browse Source 
Use the existing 'set_state' field.  Some code was using 'state'
and other code was using 'set_state'.  It didn't really matter
since lp_rast_cmd_arg is a union, but this removes some potential
confusion.

Signed-off-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17062>
This commit is contained in:
Brian Paul
2022-06-02 10:00:11 -06:00
parent 4d5d7d16dc
commit 3f0a6c7ac1
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/llvmpipe/lp_rast.c
+1 -1
View File
@@ -683,7 +683,7 @@ void
lp_rast_set_state(struct lp_rasterizer_task *task,
const union lp_rast_cmd_arg arg)
{
task->state = arg.state;
task->state = arg.set_state;
}
src/gallium/drivers/llvmpipe/lp_rast.h
-1
View File
@@ -222,7 +222,6 @@ union lp_rast_cmd_arg {
uint64_t value;
uint64_t mask;
} clear_zstencil;
const struct lp_rast_state *state;
struct lp_fence *fence;
struct llvmpipe_query *query_obj;
};
src/gallium/drivers/llvmpipe/lp_rast_debug.c
+2 -2
View File
@@ -177,7 +177,7 @@ debug_bin( const struct cmd_bin *bin, int x, int y )
while (head) {
for (i = 0; i < head->count; i++, j++) {
if (head->cmd[i] == LP_RAST_OP_SET_STATE)
state = head->arg[i].state;
state = head->arg[i].set_state;
debug_printf("%d: %s %s\n", j,
cmd_name(head->cmd[i]),
@@ -390,7 +390,7 @@ do_debug_bin( struct tile *tile,
debug_printf("%c: %15s", val, cmd_name(block->cmd[k]));
if (block->cmd[k] == LP_RAST_OP_SET_STATE)
tile->state = block->arg[k].state;
tile->state = block->arg[k].set_state;
if (block->cmd[k] == LP_RAST_OP_CLEAR_COLOR ||
block->cmd[k] == LP_RAST_OP_CLEAR_ZSTENCIL)