gallium: make p_winsys internal

[mesa.git] / src / gallium / drivers / nv10 / nv10_state.c

diff --git a/src/gallium/drivers/nv10/nv10_state.c b/src/gallium/drivers/nv10/nv10_state.c
index d2375aa2f64d10000588e3de0d6ce2c09cfbbc35..119af66dfd054e357184c34602964e1c7f7b9e56 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_state.c
+++ b/src/gallium/drivers/nv10/nv10_state.c
@@ -342,17 +342,17 @@ nv10_depth_stencil_alpha_state_create(struct pipe_context *pipe,
        hw->depth.test_enable   = cso->depth.enabled ? 1 : 0;
 
        hw->stencil.enable = cso->stencil[0].enabled ? 1 : 0;
-       hw->stencil.wmask = cso->stencil[0].write_mask;
+       hw->stencil.wmask = cso->stencil[0].writemask;
        hw->stencil.func = nvgl_comparison_op(cso->stencil[0].func);
        hw->stencil.ref = cso->stencil[0].ref_value;
-       hw->stencil.vmask = cso->stencil[0].value_mask;
+       hw->stencil.vmask = cso->stencil[0].valuemask;
        hw->stencil.fail = nvgl_stencil_op(cso->stencil[0].fail_op);
        hw->stencil.zfail = nvgl_stencil_op(cso->stencil[0].zfail_op);
        hw->stencil.zpass = nvgl_stencil_op(cso->stencil[0].zpass_op);
 
        hw->alpha.enabled = cso->alpha.enabled ? 1 : 0;
        hw->alpha.func = nvgl_comparison_op(cso->alpha.func);
-       hw->alpha.ref  = float_to_ubyte(cso->alpha.ref);
+       hw->alpha.ref  = float_to_ubyte(cso->alpha.ref_value);
 
        return (void *)hw;
 }
@@ -467,11 +467,12 @@ nv10_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
 
        if (buf) {
                void *mapped;
-               if (buf->size && (mapped = ws->buffer_map(ws, buf->buffer, PIPE_BUFFER_USAGE_CPU_READ)))
+               if (buf->buffer && buf->buffer->size &&
+                    (mapped = ws->buffer_map(ws, buf->buffer, PIPE_BUFFER_USAGE_CPU_READ)))
                {
-                       memcpy(nv10->constbuf[shader], mapped, buf->size);
+                       memcpy(nv10->constbuf[shader], mapped, buf->buffer->size);
                        nv10->constbuf_nr[shader] =
-                               buf->size / (4 * sizeof(float));
+                               buf->buffer->size / (4 * sizeof(float));
                        ws->buffer_unmap(ws, buf->buffer);
                }
        }