From: Eric Anholt <eric@anholt.net>
Date: Wed, 4 Feb 2009 18:27:13 +0000 (-0800)
Subject: intel: Fix fbo_firecube regression with FBconfigs change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b2e09910f65ae2c8c43c0441955aa262a8946ef3;p=mesa.git

intel: Fix fbo_firecube regression with FBconfigs change.

By selecting a 4444 texture format due to a bad test, we hit the
intel_update_wrapper error path, and despite the appearance of error handling
in it and its callers, the desired behavior (software fallback) doesn't occur.
---

diff --git a/src/mesa/drivers/dri/intel/intel_tex_format.c b/src/mesa/drivers/dri/intel/intel_tex_format.c
index 5e418ac4463..2715a540d02 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_format.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_format.c
@@ -16,7 +16,7 @@ intelChooseTextureFormat(GLcontext * ctx, GLint internalFormat,
                          GLenum format, GLenum type)
 {
    struct intel_context *intel = intel_context(ctx);
-   const GLboolean do32bpt = (intel->ctx.Visual.rgbBits == 32);
+   const GLboolean do32bpt = (intel->ctx.Visual.rgbBits >= 24);
 
    switch (internalFormat) {
    case 4: