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

[Kenneth Graunke]

On 10/08/2012 04:24 AM, 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?

I don't see much point.  Compilation is broken before your patch (as it 
tries to use #version 130), but not compiling it doesn't really help: if 
you try to GenerateMipmaps on an integer target, it won't have a program 
and will fail.

Let's just fix it...