summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gallium/drivers/swr
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2019-03-19 10:59:05 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2019-03-19 10:59:05 +0000
commit036675986b3a8c69c5f16cef61eeb357f0e9034c (patch)
treea05ed7bf3cb60adf336881b35c60557ed58e4f2e /lib/mesa/src/gallium/drivers/swr
parentc6c89f3d145af6172506336c12c4fed4d05956b6 (diff)
Merge Mesa 18.3.5
Diffstat (limited to 'lib/mesa/src/gallium/drivers/swr')
-rw-r--r--lib/mesa/src/gallium/drivers/swr/swr_screen.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mesa/src/gallium/drivers/swr/swr_screen.cpp b/lib/mesa/src/gallium/drivers/swr/swr_screen.cpp
index de9008ddf..c29a90bad 100644
--- a/lib/mesa/src/gallium/drivers/swr/swr_screen.cpp
+++ b/lib/mesa/src/gallium/drivers/swr/swr_screen.cpp
@@ -844,7 +844,9 @@ swr_texture_layout(struct swr_screen *screen,
size_t total_size = (uint64_t)res->swr.depth * res->swr.qpitch *
res->swr.pitch * res->swr.numSamples;
- if (total_size > SWR_MAX_TEXTURE_SIZE)
+
+ // Let non-sampled textures (e.g. buffer objects) bypass the size limit
+ if (swr_resource_is_texture(&res->base) && total_size > SWR_MAX_TEXTURE_SIZE)
return false;
if (allocate) {