summaryrefslogtreecommitdiffstats
path: root/src/isl
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2016-01-05 09:53:11 -0800
committerChad Versace <[email protected]>2016-01-05 10:00:39 -0800
commit98af1cc6d7b9cd087cf70135b0f18a8a61160b88 (patch)
tree0289205059298779ccec71a2e8f162ef28649e5d /src/isl
parent89b68dc8d09a41fc719cbdf7a5bff42476601dab (diff)
isl: Remove isl_format_layout::bpb
struct isl_format_layout contained two near-redundant members: bpb (bits per block) and bs (block size). There do exist some hardware formats for which bpb != 8 * bs, but Vulkan does not use them. Therefore we don't need bpb.
Diffstat (limited to 'src/isl')
-rw-r--r--src/isl/isl.h1
-rwxr-xr-xsrc/isl/isl_format_layout_gen.bash2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/isl/isl.h b/src/isl/isl.h
index 0faf671af2b..8dbacb6d4e8 100644
--- a/src/isl/isl.h
+++ b/src/isl/isl.h
@@ -643,7 +643,6 @@ struct isl_channel_layout {
struct isl_format_layout {
enum isl_format format;
- 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 */
diff --git a/src/isl/isl_format_layout_gen.bash b/src/isl/isl_format_layout_gen.bash
index 2511f299a7e..db883827376 100755
--- a/src/isl/isl_format_layout_gen.bash
+++ b/src/isl/isl_format_layout_gen.bash
@@ -99,7 +99,7 @@ do
cat <<EOF
[$format] = {
$format,
- .bs = $((bpb/8)), .bpb = $bpb,
+ .bs = $((bpb/8)),
.bw = $bw, .bh = $bh, .bd = $bd,
.channels = {
.r = { $red },