Mesa (master): intel: Fix build broken by ETC1 patch
Chad Versace
chadversary at kemper.freedesktop.org
Mon Jul 16 21:31:50 UTC 2012
Module: Mesa
Branch: master
Commit: 8dc074cd92dfc2f80f6c69f80f0d169ad5bb10aa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8dc074cd92dfc2f80f6c69f80f0d169ad5bb10aa
Author: Chad Versace <chad.versace at linux.intel.com>
Date: Mon Jul 16 14:29:24 2012 -0700
intel: Fix build broken by ETC1 patch
I suck at resolving merge conflicts and broke the build in a5a34b1.
This patch adds the missing field intel_mipmap_tree::wraps_etc1.
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
src/mesa/drivers/dri/intel/intel_mipmap_tree.h | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
index 2fb5775..cfd671e 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
@@ -288,6 +288,18 @@ struct intel_mipmap_tree
*/
struct intel_mipmap_tree *mcs_mt;
+ /**
+ * \brief The miptree contains RGBX data that was originally ETC1 data.
+ *
+ * On hardware that lacks support for ETC1 textures, we do the
+ * following on calls to glCompressedTexImage2D(GL_ETC1_RGB8_OES):
+ * 1. Create a miptree whose format is MESA_FORMAT_RGBX8888_REV with
+ * the wraps_etc1 flag set.
+ * 2. Translate the ETC1 data into RGBX.
+ * 3. Store the RGBX data into the miptree and discard the ETC1 data.
+ */
+ bool wraps_etc1;
+
/* These are also refcounted:
*/
GLuint refcount;
More information about the mesa-commit
mailing list