Mesa (master): isl: Bring back isl_format_layout::bpb
Jason Ekstrand
jekstrand at kemper.freedesktop.org
Wed Jul 13 18:48:04 UTC 2016
Module: Mesa
Branch: master
Commit: cf9ff082b48779c52fa6b82dc4bb163303287772
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf9ff082b48779c52fa6b82dc4bb163303287772
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Jul 8 21:55:34 2016 -0700
isl: Bring back isl_format_layout::bpb
A while ago we got rid of the bits-per-block because we thought we didn't
need it. We're about to introduce some very useful 1 and 2-bit formats so
we really should be able to handle them again.
Reviewed-by: Chad Versace <chad.versace at intel.com>
---
src/intel/isl/gen_format_layout.py | 5 +++--
src/intel/isl/isl.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/intel/isl/gen_format_layout.py b/src/intel/isl/gen_format_layout.py
index d7f3900..803967e 100644
--- a/src/intel/isl/gen_format_layout.py
+++ b/src/intel/isl/gen_format_layout.py
@@ -67,7 +67,8 @@ TEMPLATE = template.Template(
[ISL_FORMAT_${format.name}] = {
.format = ISL_FORMAT_${format.name},
.name = "ISL_FORMAT_${format.name}",
- .bs = ${format.bs},
+ .bpb = ${format.bpb},
+ .bs = ${format.bpb // 8},
.bw = ${format.bw},
.bh = ${format.bh},
.bd = ${format.bd},
@@ -137,7 +138,7 @@ class Format(object):
self.name = line[0].strip()
# Future division makes this work in python 2.
- self.bs = int(line[1]) // 8
+ self.bpb = int(line[1])
self.bw = line[2].strip()
self.bh = line[3].strip()
self.bd = line[4].strip()
diff --git a/src/intel/isl/isl.h b/src/intel/isl/isl.h
index f169fef..f74c071 100644
--- a/src/intel/isl/isl.h
+++ b/src/intel/isl/isl.h
@@ -639,6 +639,7 @@ struct isl_format_layout {
enum isl_format format;
const char *name;
+ uint16_t bpb; /**< Bits per block */
uint8_t bs; /**< Block size, in bytes, rounded towards 0 */
uint8_t bw; /**< Block width, in pixels */
uint8_t bh; /**< Block height, in pixels */
More information about the mesa-commit
mailing list