diff options
| author | Yonggang Luo <luoyonggang@gmail.com> | 2023-06-01 23:03:34 +0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-06-03 03:29:03 +0000 |
| commit | 12256136e0c9652d84270469409dce78b86812fc (patch) | |
| tree | 1cdf5827f16169ba4a604e00742cacdc0cf794b0 /src/gallium/tests | |
| parent | 5393156da4d4d497f4538c2933ee733c27940d6f (diff) | |
compiler: Rename shader_prim to mesa_prim and replace all usage of pipe_prim_type with mesa_prim
This is a prepare step to remove depends on p_defines.h in src/util/*
This is done by:
replace pipe_prim_type with mesa_prim
replace shader_prim with mesa_prim
replace PIPE_PRIM_MAX with MESA_PRIM_COUNT
replace SHADER_PRIM_ with MESA_PRIM_
replace PIPE_PRIM_ with MESA_PRIM_
This patch only replace code only
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23369>
Diffstat (limited to 'src/gallium/tests')
| -rw-r--r-- | src/gallium/tests/trivial/quad-tex.c | 2 | ||||
| -rw-r--r-- | src/gallium/tests/trivial/tri.c | 2 | ||||
| -rw-r--r-- | src/gallium/tests/unit/u_prim_verts_test.c | 26 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/tests/trivial/quad-tex.c b/src/gallium/tests/trivial/quad-tex.c index 5a54d00ec25..d0ebcb66698 100644 --- a/src/gallium/tests/trivial/quad-tex.c +++ b/src/gallium/tests/trivial/quad-tex.c @@ -336,7 +336,7 @@ static void draw(struct program *p) util_draw_vertex_buffer(p->pipe, p->cso, p->vbuf, 0, 0, - PIPE_PRIM_QUADS, + MESA_PRIM_QUADS, 4, /* verts */ 2); /* attribs/vert */ diff --git a/src/gallium/tests/trivial/tri.c b/src/gallium/tests/trivial/tri.c index 0bc09a983a2..a936433fbe1 100644 --- a/src/gallium/tests/trivial/tri.c +++ b/src/gallium/tests/trivial/tri.c @@ -268,7 +268,7 @@ static void draw(struct program *p) util_draw_vertex_buffer(p->pipe, p->cso, p->vbuf, 0, 0, - PIPE_PRIM_TRIANGLES, + MESA_PRIM_TRIANGLES, 3, /* verts */ 2); /* attribs/vert */ diff --git a/src/gallium/tests/unit/u_prim_verts_test.c b/src/gallium/tests/unit/u_prim_verts_test.c index 94b64f75eec..3b64d4112d1 100644 --- a/src/gallium/tests/unit/u_prim_verts_test.c +++ b/src/gallium/tests/unit/u_prim_verts_test.c @@ -4,27 +4,27 @@ #include "util/u_prim.h" struct test_info { - enum pipe_prim_type prim_type; + enum mesa_prim prim_type; uint32_t count; uint32_t expected; }; struct test_info tests[] = { - { PIPE_PRIM_POINTS, 0, 0 }, - { PIPE_PRIM_POINTS, 1, 1 }, - { PIPE_PRIM_POINTS, 2, 2 }, + { MESA_PRIM_POINTS, 0, 0 }, + { MESA_PRIM_POINTS, 1, 1 }, + { MESA_PRIM_POINTS, 2, 2 }, - { PIPE_PRIM_LINES, 0, 0 }, - { PIPE_PRIM_LINES, 1, 2 }, - { PIPE_PRIM_LINES, 2, 4 }, + { MESA_PRIM_LINES, 0, 0 }, + { MESA_PRIM_LINES, 1, 2 }, + { MESA_PRIM_LINES, 2, 4 }, - { PIPE_PRIM_TRIANGLES, 0, 0 }, - { PIPE_PRIM_TRIANGLES, 1, 3 }, - { PIPE_PRIM_TRIANGLES, 2, 6 }, + { MESA_PRIM_TRIANGLES, 0, 0 }, + { MESA_PRIM_TRIANGLES, 1, 3 }, + { MESA_PRIM_TRIANGLES, 2, 6 }, - { PIPE_PRIM_QUADS, 0, 0 }, - { PIPE_PRIM_QUADS, 1, 4 }, - { PIPE_PRIM_QUADS, 2, 8 }, + { MESA_PRIM_QUADS, 0, 0 }, + { MESA_PRIM_QUADS, 1, 4 }, + { MESA_PRIM_QUADS, 2, 8 }, }; int |