etnaviv: move state based texture structs
This moves the state based texture structs and their helpers into the only user. Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com> Reviewed-by: Jonathan Marek <jonathan@marek.ca>
This commit is contained in:
parent
ed0fa78b46
commit
7c687d221d
|
@ -39,6 +39,48 @@
|
|||
|
||||
#include "drm-uapi/drm_fourcc.h"
|
||||
|
||||
struct etna_sampler_state {
|
||||
struct pipe_sampler_state base;
|
||||
|
||||
/* sampler offset +4*sampler, interleave when committing state */
|
||||
uint32_t TE_SAMPLER_CONFIG0;
|
||||
uint32_t TE_SAMPLER_CONFIG1;
|
||||
uint32_t TE_SAMPLER_LOD_CONFIG;
|
||||
uint32_t TE_SAMPLER_3D_CONFIG;
|
||||
uint32_t NTE_SAMPLER_BASELOD;
|
||||
unsigned min_lod, max_lod, max_lod_min;
|
||||
};
|
||||
|
||||
static inline struct etna_sampler_state *
|
||||
etna_sampler_state(struct pipe_sampler_state *samp)
|
||||
{
|
||||
return (struct etna_sampler_state *)samp;
|
||||
}
|
||||
|
||||
struct etna_sampler_view {
|
||||
struct pipe_sampler_view base;
|
||||
|
||||
/* sampler offset +4*sampler, interleave when committing state */
|
||||
uint32_t TE_SAMPLER_CONFIG0;
|
||||
uint32_t TE_SAMPLER_CONFIG0_MASK;
|
||||
uint32_t TE_SAMPLER_CONFIG1;
|
||||
uint32_t TE_SAMPLER_3D_CONFIG;
|
||||
uint32_t TE_SAMPLER_SIZE;
|
||||
uint32_t TE_SAMPLER_LOG_SIZE;
|
||||
uint32_t TE_SAMPLER_ASTC0;
|
||||
uint32_t TE_SAMPLER_LINEAR_STRIDE[VIVS_TE_SAMPLER_LINEAR_STRIDE__LEN];
|
||||
struct etna_reloc TE_SAMPLER_LOD_ADDR[VIVS_TE_SAMPLER_LOD_ADDR__LEN];
|
||||
unsigned min_lod, max_lod; /* 5.5 fixp */
|
||||
|
||||
struct etna_sampler_ts ts;
|
||||
};
|
||||
|
||||
static inline struct etna_sampler_view *
|
||||
etna_sampler_view(struct pipe_sampler_view *view)
|
||||
{
|
||||
return (struct etna_sampler_view *)view;
|
||||
}
|
||||
|
||||
static void *
|
||||
etna_create_sampler_state_state(struct pipe_context *pipe,
|
||||
const struct pipe_sampler_state *ss)
|
||||
|
|
|
@ -27,57 +27,8 @@
|
|||
#ifndef H_ETNAVIV_TEXTURE_PLAIN
|
||||
#define H_ETNAVIV_TEXTURE_PLAIN
|
||||
|
||||
#include "drm/etnaviv_drmif.h"
|
||||
|
||||
#include "etnaviv_texture.h"
|
||||
|
||||
#include "pipe/p_context.h"
|
||||
#include "pipe/p_state.h"
|
||||
|
||||
#include "hw/state_3d.xml.h"
|
||||
|
||||
struct etna_sampler_state {
|
||||
struct pipe_sampler_state base;
|
||||
|
||||
/* sampler offset +4*sampler, interleave when committing state */
|
||||
uint32_t TE_SAMPLER_CONFIG0;
|
||||
uint32_t TE_SAMPLER_CONFIG1;
|
||||
uint32_t TE_SAMPLER_LOD_CONFIG;
|
||||
uint32_t TE_SAMPLER_3D_CONFIG;
|
||||
uint32_t NTE_SAMPLER_BASELOD;
|
||||
unsigned min_lod, max_lod, max_lod_min;
|
||||
};
|
||||
|
||||
static inline struct etna_sampler_state *
|
||||
etna_sampler_state(struct pipe_sampler_state *samp)
|
||||
{
|
||||
return (struct etna_sampler_state *)samp;
|
||||
}
|
||||
|
||||
struct etna_sampler_view {
|
||||
struct pipe_sampler_view base;
|
||||
|
||||
/* sampler offset +4*sampler, interleave when committing state */
|
||||
uint32_t TE_SAMPLER_CONFIG0;
|
||||
uint32_t TE_SAMPLER_CONFIG0_MASK;
|
||||
uint32_t TE_SAMPLER_CONFIG1;
|
||||
uint32_t TE_SAMPLER_3D_CONFIG;
|
||||
uint32_t TE_SAMPLER_SIZE;
|
||||
uint32_t TE_SAMPLER_LOG_SIZE;
|
||||
uint32_t TE_SAMPLER_ASTC0;
|
||||
uint32_t TE_SAMPLER_LINEAR_STRIDE[VIVS_TE_SAMPLER_LINEAR_STRIDE__LEN];
|
||||
struct etna_reloc TE_SAMPLER_LOD_ADDR[VIVS_TE_SAMPLER_LOD_ADDR__LEN];
|
||||
unsigned min_lod, max_lod; /* 5.5 fixp */
|
||||
|
||||
struct etna_sampler_ts ts;
|
||||
};
|
||||
|
||||
static inline struct etna_sampler_view *
|
||||
etna_sampler_view(struct pipe_sampler_view *view)
|
||||
{
|
||||
return (struct etna_sampler_view *)view;
|
||||
}
|
||||
|
||||
/* Initialize context for "plain" (non-descriptor, state-based) texture views
|
||||
* and descriptors */
|
||||
void
|
||||
|
|
Loading…
Reference in New Issue