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

mesa: Remove unused field gl_program::Varying

Browse Source 
Lots of things set and copy this field around, but nothing uses it.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick
2011-08-16 11:06:54 -07:00
parent a9f25160af
commit cd76f114e6
4 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/mtypes.h
View File

@@ -1834,8 +1834,6 @@ struct gl_program
/** Numbered local parameters */ /** Numbered local parameters */
GLfloat LocalParams[MAX_PROGRAM_LOCAL_PARAMS][4]; GLfloat LocalParams[MAX_PROGRAM_LOCAL_PARAMS][4];
/** Vertex/fragment shader varying vars */
struct gl_program_parameter_list *Varying;
/** Vertex program user-defined attributes */ /** Vertex program user-defined attributes */
struct gl_program_parameter_list *Attributes; struct gl_program_parameter_list *Attributes;

2
src/mesa/program/ir_to_mesa.cpp
View File

@@ -3045,7 +3045,6 @@ get_mesa_program(struct gl_context *ctx,
if (!prog) if (!prog)
return NULL; return NULL;
prog->Parameters = _mesa_new_parameter_list(); prog->Parameters = _mesa_new_parameter_list();
prog->Varying = _mesa_new_parameter_list();
prog->Attributes = _mesa_new_parameter_list(); prog->Attributes = _mesa_new_parameter_list();
v.ctx = ctx; v.ctx = ctx;
v.prog = prog; v.prog = prog;
@@ -3434,7 +3433,6 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
} }
} }
prog->Varying = _mesa_new_parameter_list();
_mesa_reference_vertprog(ctx, &prog->VertexProgram, NULL); _mesa_reference_vertprog(ctx, &prog->VertexProgram, NULL);
_mesa_reference_fragprog(ctx, &prog->FragmentProgram, NULL); _mesa_reference_fragprog(ctx, &prog->FragmentProgram, NULL);
_mesa_reference_geomprog(ctx, &prog->GeometryProgram, NULL); _mesa_reference_geomprog(ctx, &prog->GeometryProgram, NULL);

5
src/mesa/program/program.c
View File

@@ -394,9 +394,6 @@ _mesa_delete_program(struct gl_context *ctx, struct gl_program *prog)
if (prog->Parameters) { if (prog->Parameters) {
_mesa_free_parameter_list(prog->Parameters); _mesa_free_parameter_list(prog->Parameters);
} }
if (prog->Varying) {
_mesa_free_parameter_list(prog->Varying);
}
if (prog->Attributes) { if (prog->Attributes) {
_mesa_free_parameter_list(prog->Attributes); _mesa_free_parameter_list(prog->Attributes);
} }
@@ -522,8 +519,6 @@ _mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog)
if (prog->Parameters) if (prog->Parameters)
clone->Parameters = _mesa_clone_parameter_list(prog->Parameters); clone->Parameters = _mesa_clone_parameter_list(prog->Parameters);
memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams)); memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));
if (prog->Varying)
clone->Varying = _mesa_clone_parameter_list(prog->Varying);
if (prog->Attributes) if (prog->Attributes)
clone->Attributes = _mesa_clone_parameter_list(prog->Attributes); clone->Attributes = _mesa_clone_parameter_list(prog->Attributes);
memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams)); memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));

3
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
View File

@@ -3987,7 +3987,6 @@ get_pixel_transfer_visitor(struct st_fragment_program *fp,
prog->Parameters = _mesa_combine_parameter_lists(params, prog->Parameters = _mesa_combine_parameter_lists(params,
original->prog->Parameters); original->prog->Parameters);
prog->Attributes = _mesa_clone_parameter_list(original->prog->Attributes); prog->Attributes = _mesa_clone_parameter_list(original->prog->Attributes);
prog->Varying = _mesa_clone_parameter_list(original->prog->Varying);
_mesa_free_parameter_list(params); _mesa_free_parameter_list(params);
count_resources(v, prog); count_resources(v, prog);
fp->glsl_to_tgsi = v; fp->glsl_to_tgsi = v;
@@ -4063,7 +4062,6 @@ get_bitmap_visitor(struct st_fragment_program *fp,
/* Make modifications to fragment program info. */ /* Make modifications to fragment program info. */
prog->Parameters = _mesa_clone_parameter_list(original->prog->Parameters); prog->Parameters = _mesa_clone_parameter_list(original->prog->Parameters);
prog->Attributes = _mesa_clone_parameter_list(original->prog->Attributes); prog->Attributes = _mesa_clone_parameter_list(original->prog->Attributes);
prog->Varying = _mesa_clone_parameter_list(original->prog->Varying);
count_resources(v, prog); count_resources(v, prog);
fp->glsl_to_tgsi = v; fp->glsl_to_tgsi = v;
} }
@@ -4969,7 +4967,6 @@ get_mesa_program(struct gl_context *ctx,
if (!prog) if (!prog)
return NULL; return NULL;
prog->Parameters = _mesa_new_parameter_list(); prog->Parameters = _mesa_new_parameter_list();
prog->Varying = _mesa_new_parameter_list();
prog->Attributes = _mesa_new_parameter_list(); prog->Attributes = _mesa_new_parameter_list();
v->ctx = ctx; v->ctx = ctx;
v->prog = prog; v->prog = prog;