OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: remove struct st_vp_variant in favor of st_common_variant

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Marek Olšák
2019-11-27 22:37:35 -05:00
parent 6299b90fd4
commit a90f4453fe
7 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/state_tracker/st_atom.h
View File

@@ -38,7 +38,7 @@
struct st_context;
struct st_vertex_program;
struct st_vp_variant;
struct st_common_variant;
struct pipe_vertex_buffer;
struct pipe_vertex_element;
@@ -61,21 +61,21 @@ GLuint st_compare_func_to_pipe(GLenum func);
void
st_setup_arrays(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_vp_variant *vp_variant,
const struct st_common_variant *vp_variant,
struct pipe_vertex_element *velements,
struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers);
void
st_setup_current(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_vp_variant *vp_variant,
const struct st_common_variant *vp_variant,
struct pipe_vertex_element *velements,
struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers);
void
st_setup_current_user(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_vp_variant *vp_variant,
const struct st_common_variant *vp_variant,
struct pipe_vertex_element *velements,
struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers);

8
src/mesa/state_tracker/st_atom_array.c
View File

@@ -386,7 +386,7 @@ set_vertex_attribs(struct st_context *st,
void
st_setup_arrays(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_vp_variant *vp_variant,
const struct st_common_variant *vp_variant,
struct pipe_vertex_element *velements,
struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers)
{
@@ -456,7 +456,7 @@ st_setup_arrays(struct st_context *st,
void
st_setup_current(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_vp_variant *vp_variant,
const struct st_common_variant *vp_variant,
struct pipe_vertex_element *velements,
struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers)
{
@@ -516,7 +516,7 @@ st_setup_current(struct st_context *st,
void
st_setup_current_user(struct st_context *st,
const struct st_vertex_program *vp,
const struct st_vp_variant *vp_variant,
const struct st_common_variant *vp_variant,
struct pipe_vertex_element *velements,
struct pipe_vertex_buffer *vbuffer, unsigned *num_vbuffers)
{
@@ -549,7 +549,7 @@ st_update_array(struct st_context *st)
/* vertex program validation must be done before this */
/* _NEW_PROGRAM, ST_NEW_VS_STATE */
const struct st_vertex_program *vp = (struct st_vertex_program *)st->vp;
const struct st_vp_variant *vp_variant = st->vp_variant;
const struct st_common_variant *vp_variant = st->vp_variant;
struct pipe_vertex_buffer vbuffer[PIPE_MAX_ATTRIBS];
unsigned num_vbuffers = 0, first_upload_vbuffer;

4
src/mesa/state_tracker/st_atom_shader.c
View File

@@ -187,8 +187,8 @@ st_update_vp( struct st_context *st )
if (st->shader_has_one_variant[MESA_SHADER_VERTEX] &&
stvp->variants &&
st_vp_variant(stvp->variants)->key.passthrough_edgeflags == st->vertdata_edgeflags) {
st->vp_variant = st_vp_variant(stvp->variants);
st_common_variant(stvp->variants)->key.passthrough_edgeflags == st->vertdata_edgeflags) {
st->vp_variant = st_common_variant(stvp->variants);
} else {
struct st_common_variant_key key;

2
src/mesa/state_tracker/st_context.h
View File

@@ -259,7 +259,7 @@ struct st_context
struct gl_program *current_program[MESA_SHADER_STAGES];
};
struct st_vp_variant *vp_variant;
struct st_common_variant *vp_variant;
struct {
struct pipe_resource *pixelmap_texture;

2
src/mesa/state_tracker/st_draw_feedback.c
View File

@@ -108,7 +108,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
struct pipe_context *pipe = st->pipe;
struct draw_context *draw = st_get_draw_context(st);
const struct st_vertex_program *vp;
struct st_vp_variant *vp_variant;
struct st_common_variant *vp_variant;
struct pipe_vertex_buffer vbuffers[PIPE_MAX_SHADER_INPUTS];
unsigned num_vbuffers = 0;
struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];

12
src/mesa/state_tracker/st_program.c
View File

@@ -568,12 +568,12 @@ st_translate_vertex_program(struct st_context *st,
static const gl_state_index16 depth_range_state[STATE_LENGTH] =
{ STATE_DEPTH_RANGE };
static struct st_vp_variant *
static struct st_common_variant *
st_create_vp_variant(struct st_context *st,
struct st_program *stvp,
const struct st_common_variant_key *key)
{
struct st_vp_variant *vpv = CALLOC_STRUCT(st_vp_variant);
struct st_common_variant *vpv = CALLOC_STRUCT(st_common_variant);
struct pipe_context *pipe = st->pipe;
struct pipe_screen *screen = pipe->screen;
struct pipe_shader_state state = {0};
@@ -700,17 +700,17 @@ st_create_vp_variant(struct st_context *st,
/**
* Find/create a vertex program variant.
*/
struct st_vp_variant *
struct st_common_variant *
st_get_vp_variant(struct st_context *st,
struct st_program *stp,
const struct st_common_variant_key *key)
{
struct st_vertex_program *stvp = (struct st_vertex_program *)stp;
struct st_vp_variant *vpv;
struct st_common_variant *vpv;
/* Search for existing variant */
for (vpv = st_vp_variant(stp->variants); vpv;
vpv = st_vp_variant(vpv->base.next)) {
for (vpv = st_common_variant(stp->variants); vpv;
vpv = st_common_variant(vpv->base.next)) {
if (memcmp(&vpv->key, key, sizeof(*key)) == 0) {
break;
}

31
src/mesa/state_tracker/st_program.h
View File

@@ -198,24 +198,6 @@ struct st_common_variant_key
};
/**
* This represents a vertex program, especially translated to match
* the inputs of a particular fragment shader.
*/
struct st_vp_variant
{
struct st_variant base;
/* Parameters which generated this translated version of a vertex
* shader:
*/
struct st_common_variant_key key;
/** Bitfield of VERT_BIT_* bits of mesa vertex processing inputs */
GLbitfield vert_attrib_mask;
};
/**
* Common shader variant.
*/
@@ -225,6 +207,11 @@ struct st_common_variant
/* Parameters which generated this variant. */
struct st_common_variant_key key;
/* Bitfield of VERT_BIT_* bits matching vertex shader inputs,
* but not include the high part of doubles.
*/
GLbitfield vert_attrib_mask;
};
@@ -283,12 +270,6 @@ st_common_variant(struct st_variant *v)
return (struct st_common_variant*)v;
}
static inline struct st_vp_variant *
st_vp_variant(struct st_variant *v)
{
return (struct st_vp_variant*)v;
}
static inline struct st_fp_variant *
st_fp_variant(struct st_variant *v)
{
@@ -308,7 +289,7 @@ st_get_generic_varying_index(struct st_context *st, GLuint attr)
extern void
st_set_prog_affected_state_flags(struct gl_program *prog);
extern struct st_vp_variant *
extern struct st_common_variant *
st_get_vp_variant(struct st_context *st,
struct st_program *stvp,
const struct st_common_variant_key *key);