fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 19:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

zink: rework some includes

Browse source 
descriptors.h requires stuff from context.h and vice versa, so there's
a little redefinition here to work around that

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9883>
This commit is contained in:
Mike Blumenkrantz 2020-12-15 12:48:22 -05:00 • committed by Marge Bot
parent 5c1ce2edb8
commit 3047c7c77f
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/zink/zink_context.h
View file

@ -123,13 +123,6 @@ struct zink_viewport_state {
uint8_t num_viewports;
};
/* hashes of all the named types in a given state */
struct zink_descriptor_state {
bool valid[ZINK_DESCRIPTOR_TYPES];
uint32_t state[ZINK_DESCRIPTOR_TYPES];
};
struct zink_context {
struct pipe_context base;
struct slab_child_pool transfer_pool;

17
src/gallium/drivers/zink/zink_descriptors.h
View file

@ -31,6 +31,12 @@
#include "util/u_inlines.h"
#include "util/u_dynarray.h"
#include "zink_batch.h"
#ifndef ZINK_SHADER_COUNT
#define ZINK_SHADER_COUNT (PIPE_SHADER_TYPES - 1)
#endif
enum zink_descriptor_type {
ZINK_DESCRIPTOR_TYPE_UBO,
ZINK_DESCRIPTOR_TYPE_SAMPLER_VIEW,
@ -45,13 +51,22 @@ struct zink_descriptor_refs {
};
#include "zink_context.h"
/* hashes of all the named types in a given state */
struct zink_descriptor_state {
bool valid[ZINK_DESCRIPTOR_TYPES];
uint32_t state[ZINK_DESCRIPTOR_TYPES];
};
struct hash_table;
struct zink_context;
struct zink_image_view;
struct zink_program;
struct zink_resource;
struct zink_sampler;
struct zink_sampler_view;
struct zink_shader;
struct zink_screen;
struct zink_descriptor_state_key {