summaryrefslogtreecommitdiff
path: root/src/glsl/main.cpp
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-06-30 11:49:17 -0700
committerEric Anholt <eric@anholt.net>2010-06-30 12:01:42 -0700
commit849e18153cd91d812f694b806a84008498860bc3 (patch)
tree7a8df32990a8c3dd9697c641369d1f125a038afa /src/glsl/main.cpp
parent0eda9ae0a6bcd6a7e014df046c87fac5caee0e9e (diff)
glsl2: Use Mesa's gl_shader_program instead of our own struct glsl_program.
This avoids more allocation and shuffling of data around.
Diffstat (limited to 'src/glsl/main.cpp')
-rw-r--r--src/glsl/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp
index e78af42ac6..1ed22e1f33 100644
--- a/src/glsl/main.cpp
+++ b/src/glsl/main.cpp
@@ -206,9 +206,9 @@ main(int argc, char **argv)
if (argc <= optind)
usage_fail(argv[0]);
- struct glsl_program *whole_program;
+ struct gl_shader_program *whole_program;
- whole_program = talloc_zero (NULL, struct glsl_program);
+ whole_program = talloc_zero (NULL, struct gl_shader_program);
assert(whole_program != NULL);
for (/* empty */; argc > optind; optind++) {