summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2012-07-16 14:29:24 -0700
committerChad Versace <[email protected]>2012-07-16 14:29:24 -0700
commit8dc074cd92dfc2f80f6c69f80f0d169ad5bb10aa (patch)
tree3bfe1272038c17093f45004f5cf93242c6d1aa8c
parenta5a34b153d494ad4374e7b2c8ea13b1073a887e2 (diff)
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 <[email protected]>
-rw-r--r--src/mesa/drivers/dri/intel/intel_mipmap_tree.h12
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 2fb5775c02f..cfd671ea003 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;