Attachment 56892 Details for Bug 45872 – Proposed work-around

[patch] Proposed work-around

0001-swrast-Only-avoid-empty-_TexEnvPrograms.patch (text/plain), 1.18 KB, created by Ian Romanick on 2012-02-10 16:16:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2012-02-10 16:16:18 UTC

Size: 1.18 KB

patch

obsolete

>From 54abc7bfc97ae1f5ffdb357022c90f8617d27e34 Mon Sep 17 00:00:00 2001
>From: Ian Romanick <ian.d.romanick@intel.com>
>Date: Fri, 10 Feb 2012 16:00:27 -0800
>Subject: [PATCH] swrast: Only avoid empty _TexEnvPrograms
>
>If the generated shader for _TexEnvProgram is empty, force the use of
>the fixed-function code.  Otherwise, go ahead and use the shader.
>This works around a mysterious issue on i915 where fixed-function
>software fallbacks are not working correctly.
>
>This isn't really the fix we want, but it works around the issue.
>
>Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
>---
> src/mesa/swrast/s_fragprog.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
>index cd20d8e..8d59371 100644
>--- a/src/mesa/swrast/s_fragprog.c
>+++ b/src/mesa/swrast/s_fragprog.c
>@@ -40,7 +40,8 @@ GLboolean
> _swrast_use_fragment_program(struct gl_context *ctx)
> {
>    struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
>-   return fp && fp != ctx->FragmentProgram._TexEnvProgram;
>+   return fp && !(fp == ctx->FragmentProgram._TexEnvProgram
>+                  && fp->Base.NumInstructions == 0);
> }
> 
> /**
>-- 
>1.7.6.4
>

Actions: View | Splinter Review

Attachments on bug 45872: 56892

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.