From 32cf482215f698c46fd782104ca2e0560da5be17 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sat, 19 Jun 2010 11:24:33 -0700 Subject: [PATCH] Make shader a talloc context. --- main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index 9301d51..f6e5e95 100644 --- a/main.cpp +++ b/main.cpp @@ -29,6 +29,10 @@ #include #include +extern "C" { +#include +} + #include "ast.h" #include "glsl_parser_extras.h" #include "glsl_parser.h" @@ -186,8 +190,8 @@ main(int argc, char **argv) sizeof(struct glsl_shader *) * (whole_program.NumShaders + 1)); assert(whole_program.Shaders != NULL); - struct glsl_shader *shader = new glsl_shader; - memset(shader, 0, sizeof(*shader)); + /* talloc context should probably be whole_program */ + struct glsl_shader *shader = talloc_zero(NULL, glsl_shader); whole_program.Shaders[whole_program.NumShaders] = shader; whole_program.NumShaders++; -- 2.7.4