fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/vs: Rename vec4_generator::prog to shader_prog.

Browse source 
The next patch is going to change the type of vec4_generator::vp from
struct gl_vertex_program * to struct gl_program *, and rename it.  The
sensible name to change it to is vec4_generator::prog.  However, prog
is already used.  Since the existing vec4_generator::prog is of type
struct gl_shader_program, it makes sense to rename it to shader_prog.

Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Paul Berry 2013-04-09 14:31:28 -07:00
parent 5743bea0ba
commit 4d773603d3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_vec4.h
View file

@ -524,7 +524,7 @@ class vec4_generator
public:
vec4_generator(struct brw_context *brw,
struct brw_vs_compile *c,
struct gl_shader_program *prog,
struct gl_shader_program *shader_prog,
void *mem_ctx);
~vec4_generator();
@ -585,7 +585,7 @@ private:
struct brw_compile *p;
struct brw_vs_compile *c;
struct gl_shader_program *prog;
struct gl_shader_program *shader_prog;
struct gl_shader *shader;
const struct gl_vertex_program *vp;

8
src/mesa/drivers/dri/i965/brw_vec4_emit.cpp
View file

@ -134,14 +134,14 @@ vec4_instruction::get_src(int i)
vec4_generator::vec4_generator(struct brw_context *brw,
struct brw_vs_compile *c,
struct gl_shader_program *prog,
struct gl_shader_program *shader_prog,
void *mem_ctx)
: brw(brw), c(c), prog(prog), mem_ctx(mem_ctx)
: brw(brw), c(c), shader_prog(shader_prog), mem_ctx(mem_ctx)
{
intel = &brw->intel;
vp = &c->vp->program;
shader = prog ? prog->_LinkedShaders[MESA_SHADER_VERTEX] : NULL;
shader = shader_prog ? shader_prog->_LinkedShaders[MESA_SHADER_VERTEX] : NULL;
p = rzalloc(mem_ctx, struct brw_compile);
brw_init_compile(brw, p, mem_ctx);
@ -708,7 +708,7 @@ vec4_generator::generate_code(exec_list *instructions)
if (unlikely(INTEL_DEBUG & DEBUG_VS)) {
if (shader) {
printf("Native code for vertex shader %d:\n", prog->Name);
printf("Native code for vertex shader %d:\n", shader_prog->Name);
} else {
printf("Native code for vertex program %d:\n", c->vp->program.Base.Id);
}