Module: Mesa
Branch: master
Commit: 2c48369f54e5ed68445e4a614fc51aff1e7bb941
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2c48369f54e5ed68445e4a614fc51aff1e7bb941
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Date: Sun Feb 21 11:15:43 2016 +0100
nvc0: prefix compute macros with _CP_ instead of _COMPUTE_
Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
---
src/gallium/drivers/nouveau/nvc0/mme/com90c0.mme | 2 +-
src/gallium/drivers/nouveau/nvc0/nvc0_compute.c | 2 +-
src/gallium/drivers/nouveau/nvc0/nvc0_macros.h | 2 +-
src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/nouveau/nvc0/mme/com90c0.mme
b/src/gallium/drivers/nouveau/nvc0/mme/com90c0.mme
index a3f1bde..a9233ad 100644
--- 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 3f7a7d3..112f1c4 100644
--- 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 57262fe..eeacc71 100644
--- 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 1730a1b..998e9ea 100644
--- 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);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
