[Mesa-dev] [PATCH v2 3/3] mesa: meta: don't compile integer texture shader on ES3.0; it's broken.

Oliver McFadden oliver.mcfadden at linux.intel.com
Mon Oct 8 04:34:13 PDT 2012


On Mon, Oct 08, 2012 at 02:24:44PM +0300, Oliver McFadden wrote:
> On Thu, Oct 04, 2012 at 02:21:32PM +0300, Oliver McFadden wrote:
> > CC: Kenneth Graunke <kenneth at whitecape.org>
> > Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
> > ---
> >  src/mesa/drivers/common/meta.c |    3 +--
> >  1 files changed, 1 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
> > index d148c88..7ae32b5 100644
> > --- a/src/mesa/drivers/common/meta.c
> > +++ b/src/mesa/drivers/common/meta.c
> > @@ -3174,8 +3174,7 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
> >     sampler->shader_prog = mipmap->ShaderProg;
> >     ralloc_free(mem_ctx);
> >  
> > -   if ((_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) ||
> > -       _mesa_is_gles3(ctx)) {
> > +   if (_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) {
> >        vs = compile_shader_with_debug(ctx, GL_VERTEX_SHADER, vs_int_source);
> >        fs = compile_shader_with_debug(ctx, GL_FRAGMENT_SHADER, fs_int_source);
> >  
> > -- 
> > 1.7.8.6
> > 
> 
> Nobody wishes to review this lonely patch?

Nevermind; it appears Ian was faster than me and pushed his changes
already, rendering this patchset useless.

> 
> -- 
> Oliver McFadden.
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev

-- 
Oliver McFadden.


More information about the mesa-dev mailing list