diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-29 17:27:22 -0600 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-07-29 17:27:22 -0600 |
| commit | 6f1abb9c215583d11980294f7469da41ec14b7da (patch) | |
| tree | a6ab8447746a266a96b80d38e5441e9615ab04c1 /src | |
| parent | 1b465f287fd26d14797eca7c7a3f6cd339923e00 (diff) | |
mesa: fix issues causing warnings on Windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/texstore.c | 6 | ||||
| -rw-r--r-- | src/mesa/shader/shader_api.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 89774291f2..853205ac95 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -368,11 +368,13 @@ make_temp_float_image(GLcontext *ctx, GLuint dims, dst += srcWidth * 4; } + /* size after optional convolution */ + convWidth = srcWidth; + convHeight = srcHeight; + /* do convolution */ { GLfloat *src = tempImage + img * (srcWidth * srcHeight * 4); - convWidth = srcWidth; - convHeight = srcHeight; if (dims == 1) { ASSERT(ctx->Pixel.Convolution1DEnabled); _mesa_convolve_1d_image(ctx, &convWidth, src, convImage); diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c index a401803c3e..feb8363f50 100644 --- a/src/mesa/shader/shader_api.c +++ b/src/mesa/shader/shader_api.c @@ -509,7 +509,7 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index, struct gl_shader_program *shProg; const GLint size = -1; /* unknown size */ GLint i, oldIndex; - GLenum datatype; + GLenum datatype = GL_FLOAT_VEC4; shProg = _mesa_lookup_shader_program_err(ctx, program, "glBindAttribLocation"); @@ -543,6 +543,7 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index, i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index); if (i < 0) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation"); + return; } if (shProg->VertexProgram && oldIndex >= 0 && oldIndex != index) { |