summaryrefslogtreecommitdiff
path: root/src/mesa/shader/slang/slang_compile_struct.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-08-16 09:30:14 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-08-16 09:30:14 -0600
commit1f4997c2aaf424c8a12cc6fdb1dd994f66074a1d (patch)
treede14cfe88863d678bc618b54a7569f831fd7f590 /src/mesa/shader/slang/slang_compile_struct.c
parent1b39b92e6d7d3a7e6c39b985ffff32a79a510333 (diff)
mesa: import latest GLSL code from gallium-0.1 branch
Diffstat (limited to 'src/mesa/shader/slang/slang_compile_struct.c')
-rw-r--r--src/mesa/shader/slang/slang_compile_struct.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/shader/slang/slang_compile_struct.c b/src/mesa/shader/slang/slang_compile_struct.c
index 063db37709..e6c38730d7 100644
--- a/src/mesa/shader/slang/slang_compile_struct.c
+++ b/src/mesa/shader/slang/slang_compile_struct.c
@@ -28,7 +28,7 @@
* \author Michal Krol
*/
-#include "imports.h"
+#include "main/imports.h"
#include "slang_mem.h"
#include "slang_compile.h"
@@ -124,8 +124,7 @@ slang_struct_destruct(slang_struct * stru)
{
slang_variable_scope_destruct(stru->fields);
_slang_free(stru->fields);
- if (stru->structs)
- slang_struct_scope_destruct(stru->structs);
+ slang_struct_scope_destruct(stru->structs);
_slang_free(stru->structs);
}