gallium: fix up drivers for edgeflag changes

[mesa.git] / src / gallium / drivers / nv20 / nv20_context.c

diff --git a/src/gallium/drivers/nv20/nv20_context.c b/src/gallium/drivers/nv20/nv20_context.c
index b32d0d83ba0642fd111352c74be272447c866277..6a147a4159cebc38685a1d1389871e92901dba01 100644 (file)
--- a/src/gallium/drivers/nv20/nv20_context.c
+++ b/src/gallium/drivers/nv20/nv20_context.c
@@ -360,13 +360,13 @@ static void nv20_init_hwctx(struct nv20_context *nv20)
        OUT_RINGf (0.0);
        OUT_RINGf (16777216.0); /* [0, 1] scaled approx to [0, 2^24] */
 
-       BEGIN_RING(kelvin, NV20TCL_VIEWPORT_SCALE0_X, 4);
+       BEGIN_RING(kelvin, NV20TCL_VIEWPORT_TRANSLATE_X, 4);
        OUT_RINGf (0.0); /* x-offset, w/2 + 1.031250 */
        OUT_RINGf (0.0); /* y-offset, h/2 + 0.030762 */
        OUT_RINGf (0.0);
        OUT_RINGf (16777215.0);
 
-       BEGIN_RING(kelvin, NV20TCL_VIEWPORT_SCALE1_X, 4);
+       BEGIN_RING(kelvin, NV20TCL_VIEWPORT_SCALE_X, 4);
        OUT_RINGf (0.0); /* no effect?, w/2 */
        OUT_RINGf (0.0); /* no effect?, h/2 */
        OUT_RINGf (16777215.0 * 0.5);
@@ -375,35 +375,6 @@ static void nv20_init_hwctx(struct nv20_context *nv20)
        FIRE_RING (NULL);
 }
 
-static void
-nv20_set_edgeflags(struct pipe_context *pipe, const unsigned *bitfield)
-{
-}
-
-
-static unsigned int
-nv20_is_texture_referenced( struct pipe_context *pipe,
-                           struct pipe_texture *texture,
-                           unsigned face, unsigned level)
-{
-   /**
-    * FIXME: Optimize.
-    */
-
-   return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
-}
-
-static unsigned int
-nv20_is_buffer_referenced( struct pipe_context *pipe,
-                          struct pipe_buffer *buf)
-{
-   /**
-    * FIXME: Optimize.
-    */
-
-   return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
-}
-
 struct pipe_context *
 nv20_create(struct pipe_screen *pscreen, unsigned pctx_id)
 {
@@ -423,14 +394,13 @@ nv20_create(struct pipe_screen *pscreen, unsigned pctx_id)
        nv20->pipe.winsys = ws;
        nv20->pipe.screen = pscreen;
        nv20->pipe.destroy = nv20_destroy;
-       nv20->pipe.set_edgeflags = nv20_set_edgeflags;
        nv20->pipe.draw_arrays = nv20_draw_arrays;
        nv20->pipe.draw_elements = nv20_draw_elements;
        nv20->pipe.clear = nv20_clear;
        nv20->pipe.flush = nv20_flush;
 
-       nv20->pipe.is_texture_referenced = nv20_is_texture_referenced;
-       nv20->pipe.is_buffer_referenced = nv20_is_buffer_referenced;
+       nv20->pipe.is_texture_referenced = nouveau_is_texture_referenced;
+       nv20->pipe.is_buffer_referenced = nouveau_is_buffer_referenced;
 
        nv20_init_surface_functions(nv20);
        nv20_init_state_functions(nv20);