aboutsummaryrefslogtreecommitdiffstats
path: root/progs/glsl
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-01-14 22:31:04 +0000
committerJakob Bornecrantz <[email protected]>2010-01-14 22:31:04 +0000
commitb01ffb12ed82dcf435b186e2aff35e344a8a6ebe (patch)
treea62ee3f8f402f0c34ac88b5011da41a9cab8c6e3 /progs/glsl
parentffd28480560caecfb676a4bbe85a85672271e3f7 (diff)
parent252812bf15c3479d921157b9a432c7e42d3b9446 (diff)
Merge branch 'mesa_7_7_branch'
Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
Diffstat (limited to 'progs/glsl')
-rw-r--r--progs/glsl/convolutions.c2
-rw-r--r--progs/glsl/shtest.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/progs/glsl/convolutions.c b/progs/glsl/convolutions.c
index 350e61bbdc5..fdfaf568a25 100644
--- a/progs/glsl/convolutions.c
+++ b/progs/glsl/convolutions.c
@@ -182,7 +182,7 @@ static void fillConvolution(GLint *k,
static void setupConvolution()
{
GLint *kernel = (GLint*)malloc(sizeof(GLint) * 9);
- GLfloat scale;
+ GLfloat scale = 0.0;
GLfloat *vecKer = (GLfloat*)malloc(sizeof(GLfloat) * 9 * 4);
GLuint loc;
GLuint i;
diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c
index 7b1917be1ce..520eccfb6d8 100644
--- a/progs/glsl/shtest.c
+++ b/progs/glsl/shtest.c
@@ -29,7 +29,6 @@
#include <assert.h>
-#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>