Re: [Mesa-dev] [PATCH 1/2] nv50: add NV84_3D macro

[Samuel Pitoiset]

On 11/19/2015 05:44 PM, Ilia Mirkin wrote:

Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>

Thanks for touching up the existing uses of this :) I was going to ask
you to do it, pleasantly surprised that you did it without asking.

I'm glad to hear that from you. :)

On Thu, Nov 19, 2015 at 3:51 AM, Samuel Pitoiset
<samuel.pitoi...@gmail.com> wrote:

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
  src/gallium/drivers/nouveau/nv50/nv50_screen.c | 2 +-
  src/gallium/drivers/nouveau/nv50/nv50_vbo.c    | 4 ++--
  src/gallium/drivers/nouveau/nv50/nv50_winsys.h | 1 +
  3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c 
b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
index 4e7201d..cc7984d 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
@@ -686,7 +686,7 @@ nv50_screen_init_hwctx(struct nv50_screen *screen)
     BEGIN_NV04(push, NV50_3D(VB_ELEMENT_BASE), 1);
     PUSH_DATA (push, 0);
     if (screen->base.class_3d >= NV84_3D_CLASS) {
-      BEGIN_NV04(push, SUBC_3D(NV84_3D_VERTEX_ID_BASE), 1);
+      BEGIN_NV04(push, NV84_3D(VERTEX_ID_BASE), 1);
        PUSH_DATA (push, 0);
     }

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_vbo.c 
b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c
index 9aa593f..ac0c4d9 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c
@@ -487,7 +487,7 @@ nv50_draw_arrays(struct nv50_context *nv50,
        BEGIN_NV04(push, NV50_3D(VB_ELEMENT_BASE), 1);
        PUSH_DATA (push, 0);
        if (nv50->screen->base.class_3d >= NV84_3D_CLASS) {
-         BEGIN_NV04(push, SUBC_3D(NV84_3D_VERTEX_ID_BASE), 1);
+         BEGIN_NV04(push, NV84_3D(VERTEX_ID_BASE), 1);
           PUSH_DATA (push, 0);
        }
        nv50->state.index_bias = 0;
@@ -613,7 +613,7 @@ nv50_draw_elements(struct nv50_context *nv50, bool shorten,
        BEGIN_NV04(push, NV50_3D(VB_ELEMENT_BASE), 1);
        PUSH_DATA (push, index_bias);
        if (nv50->screen->base.class_3d >= NV84_3D_CLASS) {
-         BEGIN_NV04(push, SUBC_3D(NV84_3D_VERTEX_ID_BASE), 1);
+         BEGIN_NV04(push, NV84_3D(VERTEX_ID_BASE), 1);
           PUSH_DATA (push, index_bias);
        }
        nv50->state.index_bias = index_bias;
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_winsys.h 
b/src/gallium/drivers/nouveau/nv50/nv50_winsys.h
index 76f1b41..6800230 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_winsys.h
+++ b/src/gallium/drivers/nouveau/nv50/nv50_winsys.h
@@ -49,6 +49,7 @@ PUSH_REFN(struct nouveau_pushbuf *push, struct nouveau_bo 
*bo, uint32_t flags)

  #define SUBC_3D(m) 3, (m)
  #define NV50_3D(n) SUBC_3D(NV50_3D_##n)
+#define NV84_3D(n) SUBC_3D(NV84_3D_##n)
  #define NVA0_3D(n) SUBC_3D(NVA0_3D_##n)

  #define SUBC_2D(m) 4, (m)
--
2.6.2

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

--
-Samuel
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev