diff options
Diffstat (limited to 'progs/glsl')
| -rw-r--r-- | progs/glsl/CH11-bumpmaptex.frag | 2 | ||||
| -rw-r--r-- | progs/glsl/bump.c | 1 | ||||
| -rw-r--r-- | progs/glsl/convolutions.c | 2 | ||||
| -rw-r--r-- | progs/glsl/samplers.c | 1 | ||||
| -rw-r--r-- | progs/glsl/shtest.c | 1 |
5 files changed, 2 insertions, 5 deletions
diff --git a/progs/glsl/CH11-bumpmaptex.frag b/progs/glsl/CH11-bumpmaptex.frag index b1f93b784d..b5dabb4c8a 100644 --- a/progs/glsl/CH11-bumpmaptex.frag +++ b/progs/glsl/CH11-bumpmaptex.frag @@ -17,7 +17,7 @@ uniform float BumpDensity; // = 16.0 uniform float BumpSize; // = 0.15 uniform float SpecularFactor; // = 0.5 -sampler2D Tex; +uniform sampler2D Tex; void main() { diff --git a/progs/glsl/bump.c b/progs/glsl/bump.c index e31afab939..784596448c 100644 --- a/progs/glsl/bump.c +++ b/progs/glsl/bump.c @@ -51,7 +51,6 @@ static GLint win = 0; static GLfloat xRot = 20.0f, yRot = 0.0f, zRot = 0.0f; static GLint tangentAttrib; -static GLint tangentAttribTex; static GLuint Texture; diff --git a/progs/glsl/convolutions.c b/progs/glsl/convolutions.c index 350e61bbdc..fdfaf568a2 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/samplers.c b/progs/glsl/samplers.c index 87dad5d857..8f26a5e329 100644 --- a/progs/glsl/samplers.c +++ b/progs/glsl/samplers.c @@ -41,7 +41,6 @@ #include <string.h> #include <GL/glew.h> #include "GL/glut.h" -#include "readtex.h" #include "shaderutil.h" diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c index 7b1917be1c..520eccfb6d 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> |