X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_atom_constbuf.c;h=0a6b23aff3b09eae1ba66c3b40f3e4ed1afa80a0;hb=5092610f29b9e10d3835af8b4ed1ca13809657b5;hp=20f8b3df99d00e38ccd2c5f29a4baffa386f4dc5;hpb=dd05824b8968c723fba767698b496691e8dc81e3;p=mesa.git diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c index 20f8b3df99d..0a6b23aff3b 100644 --- a/src/mesa/state_tracker/st_atom_constbuf.c +++ b/src/mesa/state_tracker/st_atom_constbuf.c @@ -34,7 +34,7 @@ #include "main/imports.h" #include "program/prog_parameter.h" #include "program/prog_print.h" - +#include "main/shaderapi.h" #include "pipe/p_context.h" #include "pipe/p_defines.h" #include "util/u_inlines.h" @@ -51,17 +51,40 @@ /** * Pass the given program parameters to the graphics pipe as a * constant buffer. - * \param shader_type either PIPE_SHADER_VERTEX or PIPE_SHADER_FRAGMENT */ -void st_upload_constants( struct st_context *st, - struct gl_program_parameter_list *params, - unsigned shader_type) +void st_upload_constants(struct st_context *st, struct gl_program *prog) { + gl_shader_stage stage = prog->info.stage; + struct gl_program_parameter_list *params = prog->Parameters; + enum pipe_shader_type shader_type = pipe_shader_type_from_mesa(stage); + assert(shader_type == PIPE_SHADER_VERTEX || shader_type == PIPE_SHADER_FRAGMENT || shader_type == PIPE_SHADER_GEOMETRY || shader_type == PIPE_SHADER_TESS_CTRL || - shader_type == PIPE_SHADER_TESS_EVAL); + shader_type == PIPE_SHADER_TESS_EVAL || + shader_type == PIPE_SHADER_COMPUTE); + + /* update the ATI constants before rendering */ + if (shader_type == PIPE_SHADER_FRAGMENT && st->fp->ati_fs) { + struct ati_fragment_shader *ati_fs = st->fp->ati_fs; + unsigned c; + + for (c = 0; c < MAX_NUM_FRAGMENT_CONSTANTS_ATI; c++) { + if (ati_fs->LocalConstDef & (1 << c)) + memcpy(params->ParameterValues[c], + ati_fs->Constants[c], sizeof(GLfloat) * 4); + else + memcpy(params->ParameterValues[c], + st->ctx->ATIFragmentShader.GlobalConstants[c], sizeof(GLfloat) * 4); + } + } + + /* Make all bindless samplers/images bound texture/image units resident in + * the context. + */ + st_make_bound_samplers_resident(st, prog); + st_make_bound_images_resident(st, prog); /* update constants */ if (params && params->NumParameters) { @@ -76,21 +99,11 @@ void st_upload_constants( struct st_context *st, if (params->StateFlags) _mesa_load_state_parameters(st->ctx, params); - /* We always need to get a new buffer, to keep the drivers simple and - * avoid gratuitous rendering synchronization. - * Let's use a user buffer to avoid an unnecessary copy. - */ - if (st->constbuf_uploader) { - cb.buffer = NULL; - cb.user_buffer = NULL; - u_upload_data(st->constbuf_uploader, 0, paramBytes, - params->ParameterValues, &cb.buffer_offset, &cb.buffer); - u_upload_unmap(st->constbuf_uploader); - } else { - cb.buffer = NULL; - cb.user_buffer = params->ParameterValues; - cb.buffer_offset = 0; - } + _mesa_shader_write_subroutine_indices(st->ctx, stage); + + cb.buffer = NULL; + cb.user_buffer = params->ParameterValues; + cb.buffer_offset = 0; cb.buffer_size = paramBytes; if (ST_DEBUG & DEBUG_CONSTANTS) { @@ -118,128 +131,75 @@ void st_upload_constants( struct st_context *st, /** * Vertex shader: */ -static void update_vs_constants(struct st_context *st ) +void st_update_vs_constants(struct st_context *st ) { - struct st_vertex_program *vp = st->vp; - struct gl_program_parameter_list *params = vp->Base.Base.Parameters; - - st_upload_constants( st, params, PIPE_SHADER_VERTEX ); + st_upload_constants(st, &st->vp->Base); } - -const struct st_tracked_state st_update_vs_constants = { - "st_update_vs_constants", /* name */ - { /* dirty */ - _NEW_PROGRAM_CONSTANTS, /* mesa */ - ST_NEW_VERTEX_PROGRAM, /* st */ - }, - update_vs_constants /* update */ -}; - - - /** * Fragment shader: */ -static void update_fs_constants(struct st_context *st ) +void st_update_fs_constants(struct st_context *st ) { - struct st_fragment_program *fp = st->fp; - struct gl_program_parameter_list *params = fp->Base.Base.Parameters; - - st_upload_constants( st, params, PIPE_SHADER_FRAGMENT ); + st_upload_constants(st, &st->fp->Base); } -const struct st_tracked_state st_update_fs_constants = { - "st_update_fs_constants", /* name */ - { /* dirty */ - _NEW_PROGRAM_CONSTANTS, /* mesa */ - ST_NEW_FRAGMENT_PROGRAM, /* st */ - }, - update_fs_constants /* update */ -}; - /* Geometry shader: */ -static void update_gs_constants(struct st_context *st ) +void st_update_gs_constants(struct st_context *st ) { - struct st_geometry_program *gp = st->gp; - struct gl_program_parameter_list *params; + struct st_common_program *gp = st->gp; - if (gp) { - params = gp->Base.Base.Parameters; - st_upload_constants( st, params, PIPE_SHADER_GEOMETRY ); - } + if (gp) + st_upload_constants(st, &gp->Base); } -const struct st_tracked_state st_update_gs_constants = { - "st_update_gs_constants", /* name */ - { /* dirty */ - _NEW_PROGRAM_CONSTANTS, /* mesa */ - ST_NEW_GEOMETRY_PROGRAM, /* st */ - }, - update_gs_constants /* update */ -}; - /* Tessellation control shader: */ -static void update_tcs_constants(struct st_context *st ) +void st_update_tcs_constants(struct st_context *st ) { - struct st_tessctrl_program *tcp = st->tcp; - struct gl_program_parameter_list *params; + struct st_common_program *tcp = st->tcp; - if (tcp) { - params = tcp->Base.Base.Parameters; - st_upload_constants( st, params, PIPE_SHADER_TESS_CTRL ); - } + if (tcp) + st_upload_constants(st, &tcp->Base); } -const struct st_tracked_state st_update_tcs_constants = { - "st_update_tcs_constants", /* name */ - { /* dirty */ - _NEW_PROGRAM_CONSTANTS, /* mesa */ - ST_NEW_TESSCTRL_PROGRAM, /* st */ - }, - update_tcs_constants /* update */ -}; - /* Tessellation evaluation shader: */ -static void update_tes_constants(struct st_context *st ) +void st_update_tes_constants(struct st_context *st ) { - struct st_tesseval_program *tep = st->tep; - struct gl_program_parameter_list *params; + struct st_common_program *tep = st->tep; - if (tep) { - params = tep->Base.Base.Parameters; - st_upload_constants( st, params, PIPE_SHADER_TESS_EVAL ); - } + if (tep) + st_upload_constants(st, &tep->Base); } -const struct st_tracked_state st_update_tes_constants = { - "st_update_tes_constants", /* name */ - { /* dirty */ - _NEW_PROGRAM_CONSTANTS, /* mesa */ - ST_NEW_TESSEVAL_PROGRAM, /* st */ - }, - update_tes_constants /* update */ -}; - -static void st_bind_ubos(struct st_context *st, - struct gl_shader *shader, - unsigned shader_type) +/* Compute shader: + */ +void st_update_cs_constants(struct st_context *st ) +{ + struct st_compute_program *cp = st->cp; + + if (cp) + st_upload_constants(st, &cp->Base); +} + +static void st_bind_ubos(struct st_context *st, struct gl_program *prog, + unsigned shader_type) { unsigned i; struct pipe_constant_buffer cb = { 0 }; - if (!shader) + if (!prog) return; - for (i = 0; i < shader->NumUniformBlocks; i++) { - struct gl_uniform_buffer_binding *binding; + for (i = 0; i < prog->info.num_ubos; i++) { + struct gl_buffer_binding *binding; struct st_buffer_object *st_obj; - binding = &st->ctx->UniformBufferBindings[shader->UniformBlocks[i]->Binding]; + binding = + &st->ctx->UniformBufferBindings[prog->sh.UniformBlocks[i]->Binding]; st_obj = st_buffer_object(binding->BufferObject); cb.buffer = st_obj->buffer; @@ -263,102 +223,50 @@ static void st_bind_ubos(struct st_context *st, } } -static void bind_vs_ubos(struct st_context *st) +void st_bind_vs_ubos(struct st_context *st) { - struct gl_shader_program *prog = + struct gl_program *prog = st->ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]; - if (!prog) - return; - - st_bind_ubos(st, prog->_LinkedShaders[MESA_SHADER_VERTEX], PIPE_SHADER_VERTEX); + st_bind_ubos(st, prog, PIPE_SHADER_VERTEX); } -const struct st_tracked_state st_bind_vs_ubos = { - "st_bind_vs_ubos", - { - 0, - ST_NEW_VERTEX_PROGRAM | ST_NEW_UNIFORM_BUFFER, - }, - bind_vs_ubos -}; - -static void bind_fs_ubos(struct st_context *st) +void st_bind_fs_ubos(struct st_context *st) { - struct gl_shader_program *prog = + struct gl_program *prog = st->ctx->_Shader->CurrentProgram[MESA_SHADER_FRAGMENT]; - if (!prog) - return; - - st_bind_ubos(st, prog->_LinkedShaders[MESA_SHADER_FRAGMENT], PIPE_SHADER_FRAGMENT); + st_bind_ubos(st, prog, PIPE_SHADER_FRAGMENT); } -const struct st_tracked_state st_bind_fs_ubos = { - "st_bind_fs_ubos", - { - 0, - ST_NEW_FRAGMENT_PROGRAM | ST_NEW_UNIFORM_BUFFER, - }, - bind_fs_ubos -}; - -static void bind_gs_ubos(struct st_context *st) +void st_bind_gs_ubos(struct st_context *st) { - struct gl_shader_program *prog = + struct gl_program *prog = st->ctx->_Shader->CurrentProgram[MESA_SHADER_GEOMETRY]; - if (!prog) - return; - - st_bind_ubos(st, prog->_LinkedShaders[MESA_SHADER_GEOMETRY], PIPE_SHADER_GEOMETRY); + st_bind_ubos(st, prog, PIPE_SHADER_GEOMETRY); } -const struct st_tracked_state st_bind_gs_ubos = { - "st_bind_gs_ubos", - { - 0, - ST_NEW_GEOMETRY_PROGRAM | ST_NEW_UNIFORM_BUFFER, - }, - bind_gs_ubos -}; - -static void bind_tcs_ubos(struct st_context *st) +void st_bind_tcs_ubos(struct st_context *st) { - struct gl_shader_program *prog = + struct gl_program *prog = st->ctx->_Shader->CurrentProgram[MESA_SHADER_TESS_CTRL]; - if (!prog) - return; - - st_bind_ubos(st, prog->_LinkedShaders[MESA_SHADER_TESS_CTRL], PIPE_SHADER_TESS_CTRL); + st_bind_ubos(st, prog, PIPE_SHADER_TESS_CTRL); } -const struct st_tracked_state st_bind_tcs_ubos = { - "st_bind_tcs_ubos", - { - 0, - ST_NEW_TESSCTRL_PROGRAM | ST_NEW_UNIFORM_BUFFER, - }, - bind_tcs_ubos -}; - -static void bind_tes_ubos(struct st_context *st) +void st_bind_tes_ubos(struct st_context *st) { - struct gl_shader_program *prog = + struct gl_program *prog = st->ctx->_Shader->CurrentProgram[MESA_SHADER_TESS_EVAL]; - if (!prog) - return; - - st_bind_ubos(st, prog->_LinkedShaders[MESA_SHADER_TESS_EVAL], PIPE_SHADER_TESS_EVAL); + st_bind_ubos(st, prog, PIPE_SHADER_TESS_EVAL); } -const struct st_tracked_state st_bind_tes_ubos = { - "st_bind_tes_ubos", - { - 0, - ST_NEW_TESSEVAL_PROGRAM | ST_NEW_UNIFORM_BUFFER, - }, - bind_tes_ubos -}; +void st_bind_cs_ubos(struct st_context *st) +{ + struct gl_program *prog = + st->ctx->_Shader->CurrentProgram[MESA_SHADER_COMPUTE]; + + st_bind_ubos(st, prog, PIPE_SHADER_COMPUTE); +}