diff options
| author | Jason Ekstrand <jason.ekstrand@collabora.com> | 2022-04-15 17:01:17 -0500 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-09-22 09:50:23 +0000 |
| commit | 3417a0c4a222f46833df76c8be29ed83ffc1a103 (patch) | |
| tree | 08fef3125e1166c81b01a421fb8a05a8d1a2f566 /src/gallium/drivers/iris/iris_context.h | |
| parent | 06a0de492ac271215202c5f9e9040a65ca333055 (diff) | |
| download | mesa-3417a0c4a222f46833df76c8be29ed83ffc1a103.tar.gz | |
iris: Support up to 128 textures
This is required for OpenCL. I kind-of hate this patch. I really don't
like GROUP_TEXTURE_LOW64 and GROUP_TEXTURE_HIGH64 but it was either that
or I had to make all the used bitsets 128 which would have mean making
them BITSET and that would have been a lot more churn.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16442>
Diffstat (limited to 'src/gallium/drivers/iris/iris_context.h')
| -rw-r--r-- | src/gallium/drivers/iris/iris_context.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index 5ce83c40803..3edf8900e07 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -452,7 +452,8 @@ enum iris_surface_group { IRIS_SURFACE_GROUP_RENDER_TARGET, IRIS_SURFACE_GROUP_RENDER_TARGET_READ, IRIS_SURFACE_GROUP_CS_WORK_GROUPS, - IRIS_SURFACE_GROUP_TEXTURE, + IRIS_SURFACE_GROUP_TEXTURE_LOW64, + IRIS_SURFACE_GROUP_TEXTURE_HIGH64, IRIS_SURFACE_GROUP_IMAGE, IRIS_SURFACE_GROUP_UBO, IRIS_SURFACE_GROUP_SSBO, @@ -569,7 +570,7 @@ struct iris_shader_state { uint64_t bound_image_views; /** Bitfield of which sampler views are bound (non-null). */ - uint32_t bound_sampler_views; + BITSET_DECLARE(bound_sampler_views, IRIS_MAX_TEXTURES); /** Bitfield of which shader storage buffers are bound (non-null). */ uint32_t bound_ssbos; |