Make shader a talloc context.

This commit is contained in:
Kenneth Graunke
2010-06-19 11:24:33 -07:00
parent 57d0fc4139
commit 32cf482215

View File

@@ -29,6 +29,10 @@
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
extern "C" {
#include <talloc.h>
}
#include "ast.h" #include "ast.h"
#include "glsl_parser_extras.h" #include "glsl_parser_extras.h"
#include "glsl_parser.h" #include "glsl_parser.h"
@@ -186,8 +190,8 @@ main(int argc, char **argv)
sizeof(struct glsl_shader *) * (whole_program.NumShaders + 1)); sizeof(struct glsl_shader *) * (whole_program.NumShaders + 1));
assert(whole_program.Shaders != NULL); assert(whole_program.Shaders != NULL);
struct glsl_shader *shader = new glsl_shader; /* talloc context should probably be whole_program */
memset(shader, 0, sizeof(*shader)); struct glsl_shader *shader = talloc_zero(NULL, glsl_shader);
whole_program.Shaders[whole_program.NumShaders] = shader; whole_program.Shaders[whole_program.NumShaders] = shader;
whole_program.NumShaders++; whole_program.NumShaders++;