AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: pass ctx to add_uniform_to_shader constructor

Browse Source 
Fixes: 4c2422067b ("glsl: pass UseSTD430AsDefaultPacking to where it will be used")

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Timothy Arceri
2017-08-22 20:31:57 +10:00
parent 640b6e607c
commit da28280544
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/program/ir_to_mesa.cpp
+6 -4
View File
@@ -2416,7 +2416,8 @@ namespace {
class add_uniform_to_shader : public program_resource_visitor {
public:
add_uniform_to_shader(struct gl_shader_program *shader_program,
add_uniform_to_shader(struct gl_context *ctx,
struct gl_shader_program *shader_program,
struct gl_program_parameter_list *params)
: ctx(ctx), params(params), idx(-1)
{
@@ -2482,13 +2483,14 @@ add_uniform_to_shader::visit_field(const glsl_type *type, const char *name,
* \param params Parameter list to be filled in.
*/
void
_mesa_generate_parameters_list_for_uniforms(struct gl_shader_program
_mesa_generate_parameters_list_for_uniforms(struct gl_context *ctx,
struct gl_shader_program
*shader_program,
struct gl_linked_shader *sh,
struct gl_program_parameter_list
*params)
{
add_uniform_to_shader add(shader_program, params);
add_uniform_to_shader add(ctx, shader_program, params);
foreach_in_list(ir_instruction, node, sh->ir) {
ir_variable *var = node->as_variable();
@@ -2850,7 +2852,7 @@ get_mesa_program(struct gl_context *ctx,
v.shader_program = shader_program;
v.options = options;
_mesa_generate_parameters_list_for_uniforms(shader_program, shader,
_mesa_generate_parameters_list_for_uniforms(ctx, shader_program, shader,
prog->Parameters);
/* Emit Mesa IR for main(). */
src/mesa/program/ir_to_mesa.h
+2 -1
View File
@@ -38,7 +38,8 @@ void _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *pr
GLboolean _mesa_ir_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);
void
_mesa_generate_parameters_list_for_uniforms(struct gl_shader_program
_mesa_generate_parameters_list_for_uniforms(struct gl_context *ctx,
struct gl_shader_program
*shader_program,
struct gl_linked_shader *sh,
struct gl_program_parameter_list
src/mesa/state_tracker/st_glsl_to_nir.cpp
+1 -1
View File
@@ -400,7 +400,7 @@ st_nir_get_mesa_program(struct gl_context *ctx,
do_set_program_inouts(shader->ir, prog, shader->Stage);
_mesa_copy_linked_program_data(shader_program, shader);
_mesa_generate_parameters_list_for_uniforms(shader_program, shader,
_mesa_generate_parameters_list_for_uniforms(ctx, shader_program, shader,
prog->Parameters);
/* Make a pass over the IR to add state references for any built-in
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+1 -1
View File
@@ -6843,7 +6843,7 @@ get_mesa_program_tgsi(struct gl_context *ctx,
pscreen->get_shader_param(pscreen, ptarget,
PIPE_SHADER_CAP_TGSI_SKIP_MERGE_REGISTERS);
_mesa_generate_parameters_list_for_uniforms(shader_program, shader,
_mesa_generate_parameters_list_for_uniforms(ctx, shader_program, shader,
prog->Parameters);
/* Remove reads from output registers. */