so->pipe = *cso;
#ifndef NV50_SCISSORS_CLIPPING
- SB_BEGIN_3D(so, SCISSOR_ENABLE(0), 1);
- SB_DATA (so, cso->scissor);
+ for (int i = 0; i < NV50_MAX_VIEWPORTS; i++) {
+ SB_BEGIN_3D(so, SCISSOR_ENABLE(i), 1);
+ SB_DATA (so, cso->scissor);
+ }
#endif
SB_BEGIN_3D(so, SHADE_MODEL, 1);
{
unsigned s, i;
- for (s = 0; s < 3; ++s)
+ for (s = 0; s < 3; ++s) {
+ assert(nv50_context(pipe)->num_samplers[s] <= PIPE_MAX_SAMPLERS);
for (i = 0; i < nv50_context(pipe)->num_samplers[s]; ++i)
if (nv50_context(pipe)->samplers[s][i] == hwcso)
nv50_context(pipe)->samplers[s][i] = NULL;
+ }
nv50_screen_tsc_free(nv50_context(pipe)->screen, nv50_tsc_entry(hwcso));
{
unsigned i;
+ assert(nr <= PIPE_MAX_SAMPLERS);
for (i = 0; i < nr; ++i) {
struct nv50_tsc_entry *old = nv50->samplers[s][i];
if (old)
nv50_screen_tsc_unlock(nv50->screen, old);
}
+ assert(nv50->num_samplers[s] <= PIPE_MAX_SAMPLERS);
for (; i < nv50->num_samplers[s]; ++i)
if (nv50->samplers[s][i])
nv50_screen_tsc_unlock(nv50->screen, nv50->samplers[s][i]);
{
unsigned i;
+ assert(nr <= PIPE_MAX_SAMPLERS);
for (i = 0; i < nr; ++i) {
struct nv50_tic_entry *old = nv50_tic_entry(nv50->textures[s][i]);
if (old)
pipe_sampler_view_reference(&nv50->textures[s][i], views[i]);
}
+ assert(nv50->num_textures[s] <= PIPE_MAX_SAMPLERS);
for (i = nr; i < nv50->num_textures[s]; ++i) {
struct nv50_tic_entry *old = nv50_tic_entry(nv50->textures[s][i]);
if (!old)
}
static void
-nv50_vp_set_sampler_views(struct pipe_context *pipe,
- unsigned nr,
- struct pipe_sampler_view **views)
+nv50_set_sampler_views(struct pipe_context *pipe, unsigned shader,
+ unsigned start, unsigned nr,
+ struct pipe_sampler_view **views)
{
- nv50_stage_set_sampler_views(nv50_context(pipe), 0, nr, views);
+ assert(start == 0);
+ switch (shader) {
+ case PIPE_SHADER_VERTEX:
+ nv50_stage_set_sampler_views(nv50_context(pipe), 0, nr, views);
+ break;
+ case PIPE_SHADER_GEOMETRY:
+ nv50_stage_set_sampler_views(nv50_context(pipe), 1, nr, views);
+ break;
+ case PIPE_SHADER_FRAGMENT:
+ nv50_stage_set_sampler_views(nv50_context(pipe), 2, nr, views);
+ break;
+ default:
+ ;
+ }
}
-static void
-nv50_fp_set_sampler_views(struct pipe_context *pipe,
- unsigned nr,
- struct pipe_sampler_view **views)
-{
- nv50_stage_set_sampler_views(nv50_context(pipe), 2, nr, views);
-}
-static void
-nv50_gp_set_sampler_views(struct pipe_context *pipe,
- unsigned nr,
- struct pipe_sampler_view **views)
-{
- nv50_stage_set_sampler_views(nv50_context(pipe), 1, nr, views);
-}
/* ============================= SHADERS =======================================
*/
if (shader == PIPE_SHADER_COMPUTE)
return;
+ assert(i < NV50_MAX_PIPE_CONSTBUFS);
if (nv50->constbuf[s][i].user)
nv50->constbuf[s][i].u.buf = NULL;
else
nv50->dirty |= NV50_NEW_SAMPLE_MASK;
}
+static void
+nv50_set_min_samples(struct pipe_context *pipe, unsigned min_samples)
+{
+ struct nv50_context *nv50 = nv50_context(pipe);
+
+ if (nv50->min_samples != min_samples) {
+ nv50->min_samples = min_samples;
+ nv50->dirty |= NV50_NEW_MIN_SAMPLES;
+ }
+}
static void
nv50_set_framebuffer_state(struct pipe_context *pipe,
const struct pipe_scissor_state *scissor)
{
struct nv50_context *nv50 = nv50_context(pipe);
+ int i;
- nv50->scissor = *scissor;
- nv50->dirty |= NV50_NEW_SCISSOR;
+ assert(start_slot + num_scissors <= NV50_MAX_VIEWPORTS);
+ for (i = 0; i < num_scissors; i++) {
+ if (!memcmp(&nv50->scissors[start_slot + i], &scissor[i], sizeof(*scissor)))
+ continue;
+ nv50->scissors[start_slot + i] = scissor[i];
+ nv50->scissors_dirty |= 1 << (start_slot + i);
+ nv50->dirty |= NV50_NEW_SCISSOR;
+ }
}
static void
const struct pipe_viewport_state *vpt)
{
struct nv50_context *nv50 = nv50_context(pipe);
+ int i;
- nv50->viewport = *vpt;
- nv50->dirty |= NV50_NEW_VIEWPORT;
+ assert(start_slot + num_viewports <= NV50_MAX_VIEWPORTS);
+ for (i = 0; i < num_viewports; i++) {
+ if (!memcmp(&nv50->viewports[start_slot + i], &vpt[i], sizeof(*vpt)))
+ continue;
+ nv50->viewports[start_slot + i] = vpt[i];
+ nv50->viewports_dirty |= 1 << (start_slot + i);
+ nv50->dirty |= NV50_NEW_VIEWPORT;
+ }
}
static void
struct pipe_resource *res,
unsigned offset, unsigned size)
{
+ struct nv04_resource *buf = (struct nv04_resource *)res;
struct nv50_so_target *targ = MALLOC_STRUCT(nv50_so_target);
if (!targ)
return NULL;
pipe_resource_reference(&targ->pipe.buffer, res);
pipe_reference_init(&targ->pipe.reference, 1);
+ assert(buf->base.target == PIPE_BUFFER);
+ util_range_add(&buf->valid_buffer_range, offset, offset + size);
+
return &targ->pipe;
}
nv50_set_stream_output_targets(struct pipe_context *pipe,
unsigned num_targets,
struct pipe_stream_output_target **targets,
- unsigned append_mask)
+ const unsigned *offsets)
{
struct nv50_context *nv50 = nv50_context(pipe);
unsigned i;
for (i = 0; i < num_targets; ++i) {
const boolean changed = nv50->so_target[i] != targets[i];
- if (!changed && (append_mask & (1 << i)))
+ const boolean append = (offsets[i] == (unsigned)-1);
+ if (!changed && append)
continue;
nv50->so_targets_dirty |= 1 << i;
serialize = FALSE;
}
- if (targets[i] && !(append_mask & (1 << i)))
+ if (targets[i] && !append)
nv50_so_target(targets[i])->clean = TRUE;
pipe_so_target_reference(&nv50->so_target[i], targets[i]);
pipe->create_sampler_view = nv50_create_sampler_view;
pipe->sampler_view_destroy = nv50_sampler_view_destroy;
- pipe->set_vertex_sampler_views = nv50_vp_set_sampler_views;
- pipe->set_fragment_sampler_views = nv50_fp_set_sampler_views;
- pipe->set_geometry_sampler_views = nv50_gp_set_sampler_views;
+ pipe->set_sampler_views = nv50_set_sampler_views;
pipe->create_vs_state = nv50_vp_state_create;
pipe->create_fs_state = nv50_fp_state_create;
pipe->set_stencil_ref = nv50_set_stencil_ref;
pipe->set_clip_state = nv50_set_clip_state;
pipe->set_sample_mask = nv50_set_sample_mask;
+ pipe->set_min_samples = nv50_set_min_samples;
pipe->set_constant_buffer = nv50_set_constant_buffer;
pipe->set_framebuffer_state = nv50_set_framebuffer_state;
pipe->set_polygon_stipple = nv50_set_polygon_stipple;
pipe->create_stream_output_target = nv50_so_target_create;
pipe->stream_output_target_destroy = nv50_so_target_destroy;
pipe->set_stream_output_targets = nv50_set_stream_output_targets;
+
+ nv50->sample_mask = ~0;
+ nv50->min_samples = 1;
}