New upstream version 24.0.1+dfsg1
This commit is contained in:
Sebastian Ramacher
parent
b14f9eae6d
commit
5a730d6ec3
842 changed files with 42245 additions and 33385 deletions
|
|
@ -61,9 +61,9 @@ static inline void shader_var_init(struct shader_var *sv)
|
|||
memset(sv, 0, sizeof(struct shader_var));
|
||||
}
|
||||
|
||||
static inline void shader_var_init_param(struct shader_var *sv,
|
||||
char *type, char *name, bool is_uniform,
|
||||
bool is_const)
|
||||
static inline void shader_var_init_param(struct shader_var *sv, char *type,
|
||||
char *name, bool is_uniform,
|
||||
bool is_const)
|
||||
{
|
||||
if (is_uniform)
|
||||
sv->var_type = SHADER_VAR_UNIFORM;
|
||||
|
|
@ -72,10 +72,11 @@ static inline void shader_var_init_param(struct shader_var *sv,
|
|||
else
|
||||
sv->var_type = SHADER_VAR_NONE;
|
||||
|
||||
sv->type = type;
|
||||
sv->name = name;
|
||||
sv->mapping = NULL;
|
||||
sv->type = type;
|
||||
sv->name = name;
|
||||
sv->mapping = NULL;
|
||||
sv->array_count = 0;
|
||||
sv->gl_sampler_id = (size_t)-1;
|
||||
da_init(sv->default_val);
|
||||
}
|
||||
|
||||
|
|
@ -91,8 +92,8 @@ static inline void shader_var_free(struct shader_var *sv)
|
|||
|
||||
struct shader_sampler {
|
||||
char *name;
|
||||
DARRAY(char*) states;
|
||||
DARRAY(char*) values;
|
||||
DARRAY(char *) states;
|
||||
DARRAY(char *) values;
|
||||
};
|
||||
|
||||
static inline void shader_sampler_init(struct shader_sampler *ss)
|
||||
|
|
@ -114,7 +115,7 @@ static inline void shader_sampler_free(struct shader_sampler *ss)
|
|||
}
|
||||
|
||||
EXPORT void shader_sampler_convert(struct shader_sampler *ss,
|
||||
struct gs_sampler_info *info);
|
||||
struct gs_sampler_info *info);
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
|
|
@ -133,7 +134,7 @@ static inline void shader_struct_free(struct shader_struct *ss)
|
|||
size_t i;
|
||||
|
||||
for (i = 0; i < ss->vars.num; i++)
|
||||
shader_var_free(ss->vars.array+i);
|
||||
shader_var_free(ss->vars.array + i);
|
||||
|
||||
bfree(ss->name);
|
||||
da_free(ss->vars);
|
||||
|
|
@ -150,16 +151,16 @@ struct shader_func {
|
|||
struct cf_token *start, *end;
|
||||
};
|
||||
|
||||
static inline void shader_func_init(struct shader_func *sf,
|
||||
char *return_type, char *name)
|
||||
static inline void shader_func_init(struct shader_func *sf, char *return_type,
|
||||
char *name)
|
||||
{
|
||||
da_init(sf->params);
|
||||
|
||||
sf->return_type = return_type;
|
||||
sf->return_type = return_type;
|
||||
sf->mapping = NULL;
|
||||
sf->name = name;
|
||||
sf->start = NULL;
|
||||
sf->end = NULL;
|
||||
sf->name = name;
|
||||
sf->start = NULL;
|
||||
sf->end = NULL;
|
||||
}
|
||||
|
||||
static inline void shader_func_free(struct shader_func *sf)
|
||||
|
|
@ -167,7 +168,7 @@ static inline void shader_func_free(struct shader_func *sf)
|
|||
size_t i;
|
||||
|
||||
for (i = 0; i < sf->params.num; i++)
|
||||
shader_var_free(sf->params.array+i);
|
||||
shader_var_free(sf->params.array + i);
|
||||
|
||||
bfree(sf->name);
|
||||
bfree(sf->return_type);
|
||||
|
|
@ -180,10 +181,10 @@ static inline void shader_func_free(struct shader_func *sf)
|
|||
struct shader_parser {
|
||||
struct cf_parser cfp;
|
||||
|
||||
DARRAY(struct shader_var) params;
|
||||
DARRAY(struct shader_struct) structs;
|
||||
DARRAY(struct shader_var) params;
|
||||
DARRAY(struct shader_struct) structs;
|
||||
DARRAY(struct shader_sampler) samplers;
|
||||
DARRAY(struct shader_func) funcs;
|
||||
DARRAY(struct shader_func) funcs;
|
||||
};
|
||||
|
||||
static inline void shader_parser_init(struct shader_parser *sp)
|
||||
|
|
@ -201,13 +202,13 @@ static inline void shader_parser_free(struct shader_parser *sp)
|
|||
size_t i;
|
||||
|
||||
for (i = 0; i < sp->params.num; i++)
|
||||
shader_var_free(sp->params.array+i);
|
||||
shader_var_free(sp->params.array + i);
|
||||
for (i = 0; i < sp->structs.num; i++)
|
||||
shader_struct_free(sp->structs.array+i);
|
||||
shader_struct_free(sp->structs.array + i);
|
||||
for (i = 0; i < sp->samplers.num; i++)
|
||||
shader_sampler_free(sp->samplers.array+i);
|
||||
shader_sampler_free(sp->samplers.array + i);
|
||||
for (i = 0; i < sp->funcs.num; i++)
|
||||
shader_func_free(sp->funcs.array+i);
|
||||
shader_func_free(sp->funcs.array + i);
|
||||
|
||||
cf_parser_free(&sp->cfp);
|
||||
da_free(sp->params);
|
||||
|
|
@ -217,19 +218,19 @@ static inline void shader_parser_free(struct shader_parser *sp)
|
|||
}
|
||||
|
||||
EXPORT bool shader_parse(struct shader_parser *sp, const char *shader,
|
||||
const char *file);
|
||||
const char *file);
|
||||
|
||||
static inline char *shader_parser_geterrors(struct shader_parser *sp)
|
||||
{
|
||||
return error_data_buildstring(&sp->cfp.error_list);
|
||||
}
|
||||
|
||||
static inline struct shader_var *shader_parser_getparam(
|
||||
struct shader_parser *sp, const char *param_name)
|
||||
static inline struct shader_var *
|
||||
shader_parser_getparam(struct shader_parser *sp, const char *param_name)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < sp->params.num; i++) {
|
||||
struct shader_var *param = sp->params.array+i;
|
||||
struct shader_var *param = sp->params.array + i;
|
||||
if (strcmp(param->name, param_name) == 0)
|
||||
return param;
|
||||
}
|
||||
|
|
@ -237,12 +238,12 @@ static inline struct shader_var *shader_parser_getparam(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static inline struct shader_struct *shader_parser_getstruct(
|
||||
struct shader_parser *sp, const char *struct_name)
|
||||
static inline struct shader_struct *
|
||||
shader_parser_getstruct(struct shader_parser *sp, const char *struct_name)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < sp->structs.num; i++) {
|
||||
struct shader_struct *st = sp->structs.array+i;
|
||||
struct shader_struct *st = sp->structs.array + i;
|
||||
if (strcmp(st->name, struct_name) == 0)
|
||||
return st;
|
||||
}
|
||||
|
|
@ -250,12 +251,12 @@ static inline struct shader_struct *shader_parser_getstruct(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static inline struct shader_sampler *shader_parser_getsampler(
|
||||
struct shader_parser *sp, const char *sampler_name)
|
||||
static inline struct shader_sampler *
|
||||
shader_parser_getsampler(struct shader_parser *sp, const char *sampler_name)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < sp->samplers.num; i++) {
|
||||
struct shader_sampler *sampler = sp->samplers.array+i;
|
||||
struct shader_sampler *sampler = sp->samplers.array + i;
|
||||
if (strcmp(sampler->name, sampler_name) == 0)
|
||||
return sampler;
|
||||
}
|
||||
|
|
@ -263,12 +264,12 @@ static inline struct shader_sampler *shader_parser_getsampler(
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static inline struct shader_func *shader_parser_getfunc(
|
||||
struct shader_parser *sp, const char *func_name)
|
||||
static inline struct shader_func *
|
||||
shader_parser_getfunc(struct shader_parser *sp, const char *func_name)
|
||||
{
|
||||
size_t i;
|
||||
for (i = 0; i < sp->funcs.num; i++) {
|
||||
struct shader_func *func = sp->funcs.array+i;
|
||||
struct shader_func *func = sp->funcs.array + i;
|
||||
if (strcmp(func->name, func_name) == 0)
|
||||
return func;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue