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

Merge branch 'glsl-to-tgsi'

Browse Source 
Conflicts:
	src/mesa/state_tracker/st_atom_pixeltransfer.c
	src/mesa/state_tracker/st_program.c
This commit is contained in:
Bryan Cain
2011-08-04 15:43:34 -05:00
parent 50073563b2 9adcab9cd4
commit 4683529048
43 changed files with 5610 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,8 +388,9 @@ _mesa_delete_program(struct gl_context *ctx, struct gl_program *prog)
if (prog->String)
free(prog->String);
_mesa_free_instructions(prog->Instructions, prog->NumInstructions);
if (prog->Instructions) {
_mesa_free_instructions(prog->Instructions, prog->NumInstructions);
}
if (prog->Parameters) {
_mesa_free_parameter_list(prog->Parameters);
}
@@ -1031,7 +1032,8 @@ _mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog)
GLuint i;
GLuint whiteSwizzle;
GLint whiteIndex = _mesa_add_unnamed_constant(prog->Parameters,
white, 4, &whiteSwizzle);
(gl_constant_value *) white,
4, &whiteSwizzle);
(void) whiteIndex;