fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: fix issues causing warnings on Windows

Browse source
This commit is contained in:
Brian Paul 2008-07-29 17:27:22 -06:00
parent 1b465f287f
commit 6f1abb9c21
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/main/texstore.c
View file

@ -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);

3
src/mesa/shader/shader_api.c
View file

@ -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) {