nvc0: prefix compute macros with _CP_ instead of _COMPUTE_

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/src/gallium/drivers/nouveau/nvc0/mme/com90c0.mme b/src/gallium/drivers/nouveau/nvc0/mme/com90c0.mme
index a3f1bdeebcdc30ab71dd0a0bceac375b6408ab16..a9233ad801500a4a7934d3ef26a0bc5a352f7417 100644 (file)
--- a/src/gallium/drivers/nouveau/nvc0/mme/com90c0.mme
+++ b/src/gallium/drivers/nouveau/nvc0/mme/com90c0.mme
@@ -1,4 +1,4 @@
-/* NVC0_COMPUTE_MACRO_LAUNCH_GRID_INDIRECT
+/* NVC0_CP_MACRO_LAUNCH_GRID_INDIRECT
  *
  * arg     = num_groups_x
  * parm[0] = num_groups_y

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
index 3f7a7d38ffc2497c121c550700faacbbe675267d..112f1c4d07717283aa89e14203b051db5ce8261f 100644 (file)
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
@@ -376,7 +376,7 @@ nvc0_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
    if (unlikely(info->indirect)) {
       struct nv04_resource *res = nv04_resource(info->indirect);
       uint32_t offset = res->offset + info->indirect_offset;
-      unsigned macro = NVC0_COMPUTE_MACRO_LAUNCH_GRID_INDIRECT;
+      unsigned macro = NVC0_CP_MACRO_LAUNCH_GRID_INDIRECT;
 
       nouveau_pushbuf_space(push, 16, 0, 1);
       PUSH_REFN(push, res->bo, NOUVEAU_BO_RD | res->domain);

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_macros.h b/src/gallium/drivers/nouveau/nvc0/nvc0_macros.h
index 57262fe0e4ab20fab6825be6ffe29baa88ddb1b3..eeacc714f3e32367dd7713260301b755fa3dcdc1 100644 (file)
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_macros.h
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_macros.h
@@ -35,6 +35,6 @@
 
 #define NVC0_3D_MACRO_QUERY_BUFFER_WRITE                       0x00003858
 
-#define NVC0_COMPUTE_MACRO_LAUNCH_GRID_INDIRECT       0x00003860
+#define NVC0_CP_MACRO_LAUNCH_GRID_INDIRECT       0x00003860
 
 #endif /* __NVC0_MACROS_H__ */

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 1730a1bab6cc23e4ae5d8bd94e7ba5ea96ea3c59..998e9ea47ef9372efaa0afb9c3c7781c40a2b53e 100644 (file)
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -1077,7 +1077,7 @@ nvc0_screen_create(struct nouveau_device *dev)
    MK_MACRO(NVC0_3D_MACRO_DRAW_ARRAYS_INDIRECT_COUNT, mme9097_draw_arrays_indirect_count);
    MK_MACRO(NVC0_3D_MACRO_DRAW_ELEMENTS_INDIRECT_COUNT, mme9097_draw_elts_indirect_count);
    MK_MACRO(NVC0_3D_MACRO_QUERY_BUFFER_WRITE, mme9097_query_buffer_write);
-   MK_MACRO(NVC0_COMPUTE_MACRO_LAUNCH_GRID_INDIRECT, mme90c0_launch_grid_indirect);
+   MK_MACRO(NVC0_CP_MACRO_LAUNCH_GRID_INDIRECT, mme90c0_launch_grid_indirect);
 
    BEGIN_NVC0(push, NVC0_3D(RASTERIZE_ENABLE), 1);
    PUSH_DATA (push, 1);