struct nvc0_blend_stateobj *so = CALLOC_STRUCT(nvc0_blend_stateobj);
int i;
int r; /* reference */
+ uint32_t ms;
uint8_t blend_en = 0;
bool indep_masks = false;
bool indep_funcs = false;
}
}
+ ms = 0;
+ if (cso->alpha_to_coverage)
+ ms |= NVC0_3D_MULTISAMPLE_CTRL_ALPHA_TO_COVERAGE;
+ if (cso->alpha_to_one)
+ ms |= NVC0_3D_MULTISAMPLE_CTRL_ALPHA_TO_ONE;
+
+ SB_BEGIN_3D(so, MULTISAMPLE_CTRL, 1);
+ SB_DATA (so, ms);
+
assert(so->size <= ARRAY_SIZE(so->state));
return so;
}
const struct pipe_rasterizer_state *cso)
{
struct nvc0_rasterizer_stateobj *so;
+ uint16_t class_3d = nouveau_screen(pipe->screen)->class_3d;
uint32_t reg;
so = CALLOC_STRUCT(nvc0_rasterizer_stateobj);
SB_IMMED_3D(so, POINT_SPRITE_ENABLE, cso->point_quad_rasterization);
SB_IMMED_3D(so, POINT_SMOOTH_ENABLE, cso->point_smooth);
+ if (class_3d >= GM200_3D_CLASS) {
+ SB_IMMED_3D(so, FILL_RECTANGLE,
+ cso->fill_front == PIPE_POLYGON_MODE_FILL_RECTANGLE ?
+ NVC0_3D_FILL_RECTANGLE_ENABLE : 0);
+ }
+
SB_BEGIN_3D(so, MACRO_POLYGON_MODE_FRONT, 1);
SB_DATA (so, nvgl_polygon_mode(cso->fill_front));
SB_BEGIN_3D(so, MACRO_POLYGON_MODE_BACK, 1);
}
static inline void
-nvc0_stage_sampler_states_bind(struct nvc0_context *nvc0, int s,
+nvc0_stage_sampler_states_bind(struct nvc0_context *nvc0,
+ unsigned s,
unsigned nr, void **hwcso)
{
unsigned i;
}
nvc0->num_samplers[s] = nr;
-
- nvc0->dirty_3d |= NVC0_NEW_3D_SAMPLERS;
}
static void
-nvc0_stage_sampler_states_bind_range(struct nvc0_context *nvc0,
- const unsigned s,
- unsigned start, unsigned nr, void **cso)
+nvc0_bind_sampler_states(struct pipe_context *pipe,
+ enum pipe_shader_type shader,
+ unsigned start, unsigned nr, void **samplers)
{
- const unsigned end = start + nr;
- int last_valid = -1;
- unsigned i;
-
- if (cso) {
- for (i = start; i < end; ++i) {
- const unsigned p = i - start;
- if (cso[p])
- last_valid = i;
- if (cso[p] == nvc0->samplers[s][i])
- continue;
- nvc0->samplers_dirty[s] |= 1 << i;
-
- if (nvc0->samplers[s][i])
- nvc0_screen_tsc_unlock(nvc0->screen, nvc0->samplers[s][i]);
- nvc0->samplers[s][i] = cso[p];
- }
- } else {
- for (i = start; i < end; ++i) {
- if (nvc0->samplers[s][i]) {
- nvc0_screen_tsc_unlock(nvc0->screen, nvc0->samplers[s][i]);
- nvc0->samplers[s][i] = NULL;
- nvc0->samplers_dirty[s] |= 1 << i;
- }
- }
- }
+ const unsigned s = nvc0_shader_stage(shader);
- if (nvc0->num_samplers[s] <= end) {
- if (last_valid < 0) {
- for (i = start; i && !nvc0->samplers[s][i - 1]; --i);
- nvc0->num_samplers[s] = i;
- } else {
- nvc0->num_samplers[s] = last_valid + 1;
- }
- }
-}
+ assert(start == 0);
+ nvc0_stage_sampler_states_bind(nvc0_context(pipe), s, nr, samplers);
-static void
-nvc0_bind_sampler_states(struct pipe_context *pipe, unsigned shader,
- unsigned start, unsigned nr, void **s)
-{
- switch (shader) {
- case PIPE_SHADER_VERTEX:
- assert(start == 0);
- nvc0_stage_sampler_states_bind(nvc0_context(pipe), 0, nr, s);
- break;
- case PIPE_SHADER_TESS_CTRL:
- assert(start == 0);
- nvc0_stage_sampler_states_bind(nvc0_context(pipe), 1, nr, s);
- break;
- case PIPE_SHADER_TESS_EVAL:
- assert(start == 0);
- nvc0_stage_sampler_states_bind(nvc0_context(pipe), 2, nr, s);
- break;
- case PIPE_SHADER_GEOMETRY:
- assert(start == 0);
- nvc0_stage_sampler_states_bind(nvc0_context(pipe), 3, nr, s);
- break;
- case PIPE_SHADER_FRAGMENT:
- assert(start == 0);
- nvc0_stage_sampler_states_bind(nvc0_context(pipe), 4, nr, s);
- break;
- case PIPE_SHADER_COMPUTE:
- nvc0_stage_sampler_states_bind_range(nvc0_context(pipe), 5,
- start, nr, s);
+ if (s == 5)
nvc0_context(pipe)->dirty_cp |= NVC0_NEW_CP_SAMPLERS;
- break;
- }
+ else
+ nvc0_context(pipe)->dirty_3d |= NVC0_NEW_3D_SAMPLERS;
}
}
if (old) {
- nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_TEX(s, i));
+ if (s == 5)
+ nouveau_bufctx_reset(nvc0->bufctx_cp, NVC0_BIND_CP_TEX(i));
+ else
+ nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_TEX(s, i));
nvc0_screen_tic_unlock(nvc0->screen, old);
}
for (i = nr; i < nvc0->num_textures[s]; ++i) {
struct nv50_tic_entry *old = nv50_tic_entry(nvc0->textures[s][i]);
if (old) {
- nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_TEX(s, i));
+ if (s == 5)
+ nouveau_bufctx_reset(nvc0->bufctx_cp, NVC0_BIND_CP_TEX(i));
+ else
+ nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_TEX(s, i));
nvc0_screen_tic_unlock(nvc0->screen, old);
pipe_sampler_view_reference(&nvc0->textures[s][i], NULL);
}
}
nvc0->num_textures[s] = nr;
-
- nvc0->dirty_3d |= NVC0_NEW_3D_TEXTURES;
}
static void
-nvc0_stage_set_sampler_views_range(struct nvc0_context *nvc0, const unsigned s,
- unsigned start, unsigned nr,
- struct pipe_sampler_view **views)
-{
- struct nouveau_bufctx *bctx = (s == 5) ? nvc0->bufctx_cp : nvc0->bufctx_3d;
- const unsigned end = start + nr;
- const unsigned bin = (s == 5) ? NVC0_BIND_CP_TEX(0) : NVC0_BIND_3D_TEX(s, 0);
- int last_valid = -1;
- unsigned i;
-
- if (views) {
- for (i = start; i < end; ++i) {
- const unsigned p = i - start;
- if (views[p])
- last_valid = i;
- if (views[p] == nvc0->textures[s][i])
- continue;
- nvc0->textures_dirty[s] |= 1 << i;
-
- if (views[p] && views[p]->texture) {
- struct pipe_resource *res = views[p]->texture;
- if (res->target == PIPE_BUFFER &&
- (res->flags & PIPE_RESOURCE_FLAG_MAP_COHERENT))
- nvc0->textures_coherent[s] |= 1 << i;
- else
- nvc0->textures_coherent[s] &= ~(1 << i);
- } else {
- nvc0->textures_coherent[s] &= ~(1 << i);
- }
-
- if (nvc0->textures[s][i]) {
- struct nv50_tic_entry *old = nv50_tic_entry(nvc0->textures[s][i]);
- nouveau_bufctx_reset(bctx, bin + i);
- nvc0_screen_tic_unlock(nvc0->screen, old);
- }
- pipe_sampler_view_reference(&nvc0->textures[s][i], views[p]);
- }
- } else {
- for (i = start; i < end; ++i) {
- struct nv50_tic_entry *old = nv50_tic_entry(nvc0->textures[s][i]);
- if (!old)
- continue;
- nvc0->textures_dirty[s] |= 1 << i;
-
- nvc0_screen_tic_unlock(nvc0->screen, old);
- pipe_sampler_view_reference(&nvc0->textures[s][i], NULL);
- nouveau_bufctx_reset(bctx, bin + i);
- }
- }
-
- if (nvc0->num_textures[s] <= end) {
- if (last_valid < 0) {
- for (i = start; i && !nvc0->textures[s][i - 1]; --i);
- nvc0->num_textures[s] = i;
- } else {
- nvc0->num_textures[s] = last_valid + 1;
- }
- }
-}
-
-static void
-nvc0_set_sampler_views(struct pipe_context *pipe, unsigned shader,
+nvc0_set_sampler_views(struct pipe_context *pipe, enum pipe_shader_type shader,
unsigned start, unsigned nr,
struct pipe_sampler_view **views)
{
+ const unsigned s = nvc0_shader_stage(shader);
+
assert(start == 0);
- switch (shader) {
- case PIPE_SHADER_VERTEX:
- nvc0_stage_set_sampler_views(nvc0_context(pipe), 0, nr, views);
- break;
- case PIPE_SHADER_TESS_CTRL:
- nvc0_stage_set_sampler_views(nvc0_context(pipe), 1, nr, views);
- break;
- case PIPE_SHADER_TESS_EVAL:
- nvc0_stage_set_sampler_views(nvc0_context(pipe), 2, nr, views);
- break;
- case PIPE_SHADER_GEOMETRY:
- nvc0_stage_set_sampler_views(nvc0_context(pipe), 3, nr, views);
- break;
- case PIPE_SHADER_FRAGMENT:
- nvc0_stage_set_sampler_views(nvc0_context(pipe), 4, nr, views);
- break;
- case PIPE_SHADER_COMPUTE:
- nvc0_stage_set_sampler_views_range(nvc0_context(pipe), 5,
- start, nr, views);
+ nvc0_stage_set_sampler_views(nvc0_context(pipe), s, nr, views);
+
+ if (s == 5)
nvc0_context(pipe)->dirty_cp |= NVC0_NEW_CP_TEXTURES;
- break;
- default:
- ;
- }
+ else
+ nvc0_context(pipe)->dirty_3d |= NVC0_NEW_3D_TEXTURES;
}
-
/* ============================= SHADERS =======================================
*/
prog->pipe.tokens = tgsi_dup_tokens((const struct tgsi_token *)cso->prog);
+ prog->translated = nvc0_program_translate(
+ prog, nvc0_context(pipe)->screen->base.device->chipset,
+ &nouveau_context(pipe)->debug);
+
return (void *)prog;
}
}
static void
-nvc0_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
+nvc0_set_constant_buffer(struct pipe_context *pipe,
+ enum pipe_shader_type shader, uint index,
const struct pipe_constant_buffer *cb)
{
struct nvc0_context *nvc0 = nvc0_context(pipe);
for (i = 0; i < count; ++i) {
unsigned dst_index = start_slot + i;
- if (vb[i].user_buffer) {
+ if (vb[i].is_user_buffer) {
nvc0->vbo_user |= 1 << dst_index;
if (!vb[i].stride && nvc0->screen->eng3d->oclass < GM107_3D_CLASS)
nvc0->constant_vbos |= 1 << dst_index;
nvc0->vbo_user &= ~(1 << dst_index);
nvc0->constant_vbos &= ~(1 << dst_index);
- if (vb[i].buffer &&
- vb[i].buffer->flags & PIPE_RESOURCE_FLAG_MAP_COHERENT)
+ if (vb[i].buffer.resource &&
+ vb[i].buffer.resource->flags & PIPE_RESOURCE_FLAG_MAP_COHERENT)
nvc0->vtxbufs_coherent |= (1 << dst_index);
else
nvc0->vtxbufs_coherent &= ~(1 << dst_index);
}
}
-static void
-nvc0_set_index_buffer(struct pipe_context *pipe,
- const struct pipe_index_buffer *ib)
-{
- struct nvc0_context *nvc0 = nvc0_context(pipe);
-
- if (nvc0->idxbuf.buffer)
- nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_IDX);
-
- if (ib) {
- pipe_resource_reference(&nvc0->idxbuf.buffer, ib->buffer);
- nvc0->idxbuf.index_size = ib->index_size;
- if (ib->buffer) {
- nvc0->idxbuf.offset = ib->offset;
- nvc0->dirty_3d |= NVC0_NEW_3D_IDXBUF;
- } else {
- nvc0->idxbuf.user_buffer = ib->user_buffer;
- nvc0->dirty_3d &= ~NVC0_NEW_3D_IDXBUF;
- }
- } else {
- nvc0->dirty_3d &= ~NVC0_NEW_3D_IDXBUF;
- pipe_resource_reference(&nvc0->idxbuf.buffer, NULL);
- }
-}
-
static void
nvc0_vertex_state_bind(struct pipe_context *pipe, void *hwcso)
{
}
static void
-nvc0_set_shader_images(struct pipe_context *pipe, unsigned shader,
+nvc0_set_shader_images(struct pipe_context *pipe,
+ enum pipe_shader_type shader,
unsigned start, unsigned nr,
const struct pipe_image_view *images)
{
static void
nvc0_set_shader_buffers(struct pipe_context *pipe,
- unsigned shader,
+ enum pipe_shader_type shader,
unsigned start, unsigned nr,
const struct pipe_shader_buffer *buffers)
{
pipe->bind_vertex_elements_state = nvc0_vertex_state_bind;
pipe->set_vertex_buffers = nvc0_set_vertex_buffers;
- pipe->set_index_buffer = nvc0_set_index_buffer;
pipe->create_stream_output_target = nvc0_so_target_create;
pipe->stream_output_target_destroy = nvc0_so_target_destroy;
projects / mesa.git / blobdiff