diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-29 09:02:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-29 09:02:30 +0200 |
| commit | 28257038c4f13ac26127d536c14c922aa036efed (patch) | |
| tree | 12972a932e1c9f6cd4b3898dbc09cbf43bd16b0d /mesalib/src/mesa/main | |
| parent | 01dc3700436c1fa006d38434e110b68b5d9702ce (diff) | |
| download | vcxsrv-28257038c4f13ac26127d536c14c922aa036efed.tar.gz vcxsrv-28257038c4f13ac26127d536c14c922aa036efed.tar.bz2 vcxsrv-28257038c4f13ac26127d536c14c922aa036efed.zip | |
libX11 mesa pixman git update 29 jul 2011
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/ff_fragment_shader.cpp | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/framebuffer.c | 1 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texparam.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp index 0b53c28f7..dbfa6b57d 100644 --- a/mesalib/src/mesa/main/ff_fragment_shader.cpp +++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp @@ -330,8 +330,7 @@ static GLbitfield get_fp_input_mask( struct gl_context *ctx ) /* _NEW_RENDERMODE */ fp_inputs = (FRAG_BIT_COL0 | FRAG_BIT_TEX0); } - else if (!(vertexProgram || vertexShader) || - !ctx->VertexProgram._Current) { + else if (!(vertexProgram || vertexShader)) { /* Fixed function vertex logic */ /* _NEW_ARRAY */ GLbitfield varying_inputs = ctx->varying_vp_inputs; diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c index e27569a6f..23fa1b2c1 100644 --- a/mesalib/src/mesa/main/framebuffer.c +++ b/mesalib/src/mesa/main/framebuffer.c @@ -548,6 +548,7 @@ _mesa_update_framebuffer_visual(struct gl_context *ctx, fb->Visual.rgbBits = fb->Visual.redBits + fb->Visual.greenBits + fb->Visual.blueBits; fb->Visual.samples = rb->NumSamples; + fb->Visual.sampleBuffers = rb->NumSamples > 0 ? 1 : 0; if (_mesa_get_format_color_encoding(fmt) == GL_SRGB) fb->Visual.sRGBCapable = ctx->Const.sRGBCapable; break; diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index c4ec29533..3f771f08b 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/src/mesa/main/texparam.c @@ -888,7 +888,7 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level, texObj = _mesa_select_tex_object(ctx, texUnit, target); img = _mesa_select_tex_image(ctx, texObj, target, level); - if (!img || !img->TexFormat) { + if (!img || img->TexFormat == MESA_FORMAT_NONE) { /* undefined texture image */ if (pname == GL_TEXTURE_COMPONENTS) *params = 1; |