[Mesa-dev] [PATCH 2/4] nv30: remove unused render_mode and hw_pointsprite_control

Ilia Mirkin imirkin at alum.mit.edu
Thu Feb 20 23:37:11 PST 2014


Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---

Were these things that didn't get quite ported over from the old nvfx? If so,
does it matter? Are they things we need? Even if they are, they can be
implemented in a way that doesn't put that state into nv30_context.

 src/gallium/drivers/nouveau/nv30/nv30_context.c |  1 -
 src/gallium/drivers/nouveau/nv30/nv30_context.h | 10 +++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nv30/nv30_context.c b/src/gallium/drivers/nouveau/nv30/nv30_context.c
index 4f68eee..4a4538c 100644
--- a/src/gallium/drivers/nouveau/nv30/nv30_context.c
+++ b/src/gallium/drivers/nouveau/nv30/nv30_context.c
@@ -235,7 +235,6 @@ nv30_context_create(struct pipe_screen *pscreen, void *priv)
 
    /*XXX: nvfx... */
    nv30->is_nv4x = (screen->eng3d->oclass >= NV40_3D_CLASS) ? ~0 : 0;
-   nv30->render_mode = HW;
 
    nv30->sample_mask = 0xffff;
    nv30_vbo_init(pipe);
diff --git a/src/gallium/drivers/nouveau/nv30/nv30_context.h b/src/gallium/drivers/nouveau/nv30/nv30_context.h
index d0cb5f5..864d97a 100644
--- a/src/gallium/drivers/nouveau/nv30/nv30_context.h
+++ b/src/gallium/drivers/nouveau/nv30/nv30_context.h
@@ -119,16 +119,12 @@ struct nv30_context {
    struct nouveau_heap  *blit_vp;
    struct pipe_resource *blit_fp;
 
-   /*XXX: nvfx state, DO NOT USE EVER OUTSIDE "STOLEN" NVFX code */
-   unsigned is_nv4x;
-   bool hw_pointsprite_control;
-   enum {
-      HW,
-   } render_mode;
-
    struct pipe_query *render_cond_query;
    unsigned render_cond_mode;
    boolean render_cond_cond;
+
+   /*XXX: nvfx state, DO NOT USE EVER OUTSIDE "STOLEN" NVFX code */
+   unsigned is_nv4x;
 };
 
 static INLINE struct nv30_context *
-- 
1.8.3.2



More information about the mesa-dev mailing list