summaryrefslogtreecommitdiffstats
path: root/src/intel/isl/isl_surface_state.c
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-17 03:40:28 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-12-17 03:40:28 +0100
commitef9a82038acd73936830671dbe43205c28a2151d (patch)
tree90be2cdd9f48750c18b669ca2ab9553575d9f822 /src/intel/isl/isl_surface_state.c
parentf84f60446aebaeee8a1df741328cbd4a30dd24ea (diff)
parent743c2327b167b95046e02af4c7b2f7a282a0943d (diff)
downloadexternal_mesa3d-ef9a82038acd73936830671dbe43205c28a2151d.zip
external_mesa3d-ef9a82038acd73936830671dbe43205c28a2151d.tar.gz
external_mesa3d-ef9a82038acd73936830671dbe43205c28a2151d.tar.bz2
Merge remote-tracking branch 'androidx86/marshmallow-x86' into replicant-6.0replicant-6.0-beta-0001replicant-6.0-alpha-0006replicant-6.0-old
Diffstat (limited to 'src/intel/isl/isl_surface_state.c')
-rw-r--r--src/intel/isl/isl_surface_state.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c
index b2317d8..1c985b6 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -430,8 +430,15 @@ isl_genX(buffer_fill_state_s)(void *state,
uint32_t num_elements = info->size / info->stride;
if (GEN_GEN >= 7) {
+ /* From the IVB PRM, SURFACE_STATE::Height,
+ *
+ * For typed buffer and structured buffer surfaces, the number
+ * of entries in the buffer ranges from 1 to 2^27. For raw buffer
+ * surfaces, the number of entries in the buffer is the number of bytes
+ * which can range from 1 to 2^30.
+ */
if (info->format == ISL_FORMAT_RAW) {
- assert(num_elements <= (1ull << 31));
+ assert(num_elements <= (1ull << 30));
assert((num_elements & 3) == 0);
} else {
assert(num_elements <= (1ull << 27));