OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Constify nir_lower_sampler's gl_shader_program pointer.

Browse Source 
Now that we're not generating linker errors, we don't actually modify
this.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kenneth Graunke
2015-04-07 15:50:54 -07:00
parent 709b88ccd8
commit 500da98e0b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/nir/nir.h
View File

@@ -1611,7 +1611,7 @@ void nir_lower_alu_to_scalar(nir_shader *shader);
void nir_lower_phis_to_scalar(nir_shader *shader); void nir_lower_phis_to_scalar(nir_shader *shader);
void nir_lower_samplers(nir_shader *shader, void nir_lower_samplers(nir_shader *shader,
struct gl_shader_program *shader_program, const struct gl_shader_program *shader_program,
gl_shader_stage stage); gl_shader_stage stage);
void nir_lower_system_values(nir_shader *shader); void nir_lower_system_values(nir_shader *shader);

10
src/glsl/nir/nir_lower_samplers.cpp
View File

@@ -36,7 +36,7 @@ extern "C" {
} }
static unsigned static unsigned
get_sampler_index(struct gl_shader_program *shader_program, get_sampler_index(const struct gl_shader_program *shader_program,
gl_shader_stage stage, const char *name) gl_shader_stage stage, const char *name)
{ {
unsigned location; unsigned location;
@@ -54,7 +54,7 @@ get_sampler_index(struct gl_shader_program *shader_program,
} }
static void static void
lower_sampler(nir_tex_instr *instr, struct gl_shader_program *shader_program, lower_sampler(nir_tex_instr *instr, const struct gl_shader_program *shader_program,
gl_shader_stage stage, void *mem_ctx) gl_shader_stage stage, void *mem_ctx)
{ {
if (instr->sampler == NULL) if (instr->sampler == NULL)
@@ -133,7 +133,7 @@ lower_sampler(nir_tex_instr *instr, struct gl_shader_program *shader_program,
typedef struct { typedef struct {
void *mem_ctx; void *mem_ctx;
struct gl_shader_program *shader_program; const struct gl_shader_program *shader_program;
gl_shader_stage stage; gl_shader_stage stage;
} lower_state; } lower_state;
@@ -154,7 +154,7 @@ lower_block_cb(nir_block *block, void *_state)
} }
static void static void
lower_impl(nir_function_impl *impl, struct gl_shader_program *shader_program, lower_impl(nir_function_impl *impl, const struct gl_shader_program *shader_program,
gl_shader_stage stage) gl_shader_stage stage)
{ {
lower_state state; lower_state state;
@@ -167,7 +167,7 @@ lower_impl(nir_function_impl *impl, struct gl_shader_program *shader_program,
} }
extern "C" void extern "C" void
nir_lower_samplers(nir_shader *shader, struct gl_shader_program *shader_program, nir_lower_samplers(nir_shader *shader, const struct gl_shader_program *shader_program,
gl_shader_stage stage) gl_shader_stage stage)
{ {
nir_foreach_overload(shader, overload) { nir_foreach_overload(shader, overload) {