softpipe: s/varient/variant
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
|
||||
#include "tgsi/tgsi_exec.h"
|
||||
|
||||
struct sp_sampler_varient;
|
||||
struct sp_sampler_variant;
|
||||
|
||||
typedef void (*wrap_nearest_func)(const float s[4],
|
||||
unsigned size,
|
||||
@@ -44,7 +44,7 @@ typedef void (*wrap_linear_func)(const float s[4],
|
||||
int icoord1[4],
|
||||
float w[4]);
|
||||
|
||||
typedef float (*compute_lambda_func)(const struct sp_sampler_varient *sampler,
|
||||
typedef float (*compute_lambda_func)(const struct sp_sampler_variant *sampler,
|
||||
const float s[QUAD_SIZE],
|
||||
const float t[QUAD_SIZE],
|
||||
const float p[QUAD_SIZE]);
|
||||
@@ -76,7 +76,7 @@ union sp_sampler_key {
|
||||
/**
|
||||
* Subclass of tgsi_sampler
|
||||
*/
|
||||
struct sp_sampler_varient
|
||||
struct sp_sampler_variant
|
||||
{
|
||||
struct tgsi_sampler base; /**< base class */
|
||||
|
||||
@@ -121,29 +121,29 @@ struct sp_sampler_varient
|
||||
|
||||
/* Linked list:
|
||||
*/
|
||||
struct sp_sampler_varient *next;
|
||||
struct sp_sampler_variant *next;
|
||||
};
|
||||
|
||||
struct sp_sampler;
|
||||
|
||||
/* Create a sampler varient for a given set of non-orthogonal state. Currently the
|
||||
/* Create a sampler variant for a given set of non-orthogonal state. Currently the
|
||||
*/
|
||||
struct sp_sampler_varient *
|
||||
sp_create_sampler_varient( const struct pipe_sampler_state *sampler,
|
||||
struct sp_sampler_variant *
|
||||
sp_create_sampler_variant( const struct pipe_sampler_state *sampler,
|
||||
const union sp_sampler_key key );
|
||||
|
||||
void sp_sampler_varient_bind_texture( struct sp_sampler_varient *varient,
|
||||
void sp_sampler_variant_bind_texture( struct sp_sampler_variant *variant,
|
||||
struct softpipe_tex_tile_cache *tex_cache,
|
||||
const struct pipe_resource *tex );
|
||||
|
||||
void sp_sampler_varient_destroy( struct sp_sampler_varient * );
|
||||
void sp_sampler_variant_destroy( struct sp_sampler_variant * );
|
||||
|
||||
|
||||
|
||||
static INLINE struct sp_sampler_varient *
|
||||
sp_sampler_varient(const struct tgsi_sampler *sampler)
|
||||
static INLINE struct sp_sampler_variant *
|
||||
sp_sampler_variant(const struct tgsi_sampler *sampler)
|
||||
{
|
||||
return (struct sp_sampler_varient *) sampler;
|
||||
return (struct sp_sampler_variant *) sampler;
|
||||
}
|
||||
|
||||
extern void
|
||||
|
Reference in New Issue
Block a user