nouveau: bypass_vs_clip_and_viewport

diff --git a/src/gallium/drivers/nv30/nv30_state_viewport.c b/src/gallium/drivers/nv30/nv30_state_viewport.c
index 4b8300d..c3eb413 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state_viewport.c
+++ b/src/gallium/drivers/nv30/nv30_state_viewport.c
@@ -7,7 +7,8 @@ nv30_state_viewport_validate(struct nv30_context *nv30)
        struct nouveau_stateobj *so;
        unsigned bypass;
 
-       if (/*nv30->render_mode == HW &&*/ !nv30->rasterizer->pipe.bypass_clipping)
+       if (/*nv30->render_mode == HW &&*/
+           !nv30->rasterizer->pipe.bypass_vs_clip_and_viewport)
                bypass = 0;
        else
                bypass = 1;

diff --git a/src/gallium/drivers/nv40/nv40_state_viewport.c b/src/gallium/drivers/nv40/nv40_state_viewport.c
index 3d14d20..665d2d5 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state_viewport.c
+++ b/src/gallium/drivers/nv40/nv40_state_viewport.c
@@ -7,7 +7,8 @@ nv40_state_viewport_validate(struct nv40_context *nv40)
        struct nouveau_stateobj *so;
        unsigned bypass;
 
-       if (nv40->render_mode == HW && !nv40->rasterizer->pipe.bypass_clipping)
+       if (nv40->render_mode == HW &&
+           !nv40->rasterizer->pipe.bypass_vs_clip_and_viewport)
                bypass = 0;
        else
                bypass = 1;

diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
index b7958f1..85098a7 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state_validate.c
+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
@@ -254,7 +254,7 @@ scissor_uptodate:
        if (nv50->dirty & NV50_NEW_VIEWPORT) {
                unsigned bypass;
 
-               if (!nv50->rasterizer->pipe.bypass_clipping)
+               if (!nv50->rasterizer->pipe.bypass_vs_clip_and_viewport)
                        bypass = 0;
                else
                        bypass = 1;

diff --git a/src/gallium/state_trackers/g3dvl/vl_basic_csc.c b/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
index 38cfd5d..b61b49a 100644 (file)
--- a/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
+++ b/src/gallium/state_trackers/g3dvl/vl_basic_csc.c
@@ -371,7 +371,7 @@ static int vlCreateVertexShader
        unsigned int                    ti;
        unsigned int                    i;
 
-       assert(context);
+       assert(csc);
 
        pipe = csc->pipe;
        tokens = (struct tgsi_token*)MALLOC(max_tokens * sizeof(struct tgsi_token));
@@ -458,7 +458,7 @@ static int vlCreateFragmentShader
        unsigned int                    ti;
        unsigned int                    i;
 
-       assert(context);
+       assert(csc);
 
        pipe = csc->pipe;
        tokens = (struct tgsi_token*)MALLOC(max_tokens * sizeof(struct tgsi_token));

diff --git a/src/gallium/state_trackers/g3dvl/vl_context.c b/src/gallium/state_trackers/g3dvl/vl_context.c
index 65ddb9f..1d8ad0b 100644 (file)
--- a/src/gallium/state_trackers/g3dvl/vl_context.c
+++ b/src/gallium/state_trackers/g3dvl/vl_context.c
@@ -41,9 +41,7 @@ static int vlInitCommon(struct vlContext *context)
        rast.line_stipple_factor = 0;
        rast.line_stipple_pattern = 0;
        rast.line_last_pixel = 0;
-       /* Don't need clipping, but viewport mapping done here */
-       rast.bypass_clipping = 0;
-       rast.bypass_vs = 0;
+       rast.bypass_vs_clip_and_viewport = 0;
        rast.origin_lower_left = 0;
        rast.line_width = 1;
        rast.point_smooth = 0;