NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

draw: add support for passing images to vs/gs shaders.

Browse source 
This just adds support for passing through images to the
tgsi execution stage.

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-03-22 07:58:39 +10:00
parent 22d1296013
commit 0d1f679ded
5 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/auxiliary/draw/draw_context.c
View file

@ -731,6 +731,24 @@ draw_texture_sampler(struct draw_context *draw,
}
}
/**
* Provide TGSI image objects for vertex/geometry shaders that use
* texture fetches. This state only needs to be set once per context.
* This might only be used by software drivers for the time being.
*/
void
draw_image(struct draw_context *draw,
uint shader,
struct tgsi_image *image)
{
if (shader == PIPE_SHADER_VERTEX) {
draw->vs.tgsi.image = image;
} else {
debug_assert(shader == PIPE_SHADER_GEOMETRY);
draw->gs.tgsi.image = image;
}
}

6
src/gallium/auxiliary/draw/draw_context.h
View file

@ -48,6 +48,7 @@ struct draw_vertex_shader;
struct draw_geometry_shader;
struct draw_fragment_shader;
struct tgsi_sampler;
struct tgsi_image;
/*
* structure to contain driver internal information
@ -154,6 +155,11 @@ draw_texture_sampler(struct draw_context *draw,
uint shader_type,
struct tgsi_sampler *sampler);
void
draw_image(struct draw_context *draw,
uint shader_type,
struct tgsi_image *image);
void
draw_set_sampler_views(struct draw_context *draw,
unsigned shader_stage,

2
src/gallium/auxiliary/draw/draw_gs.c
View file

@ -681,7 +681,7 @@ void draw_geometry_shader_prepare(struct draw_geometry_shader *shader,
if (!use_llvm && shader && shader->machine->Tokens != shader->state.tokens) {
tgsi_exec_machine_bind_shader(shader->machine,
shader->state.tokens,
draw->gs.tgsi.sampler, NULL);
draw->gs.tgsi.sampler, draw->gs.tgsi.image);
}
}

3
src/gallium/auxiliary/draw/draw_private.h
View file

@ -66,6 +66,7 @@ struct draw_stage;
struct vbuf_render;
struct tgsi_exec_machine;
struct tgsi_sampler;
struct tgsi_image;
struct draw_pt_front_end;
struct draw_assembler;
struct draw_llvm;
@ -267,6 +268,7 @@ struct draw_context
struct tgsi_exec_machine *machine;
struct tgsi_sampler *sampler;
struct tgsi_image *image;
} tgsi;
struct translate *fetch;
@ -286,6 +288,7 @@ struct draw_context
struct tgsi_exec_machine *machine;
struct tgsi_sampler *sampler;
struct tgsi_image *image;
} tgsi;
} gs;

2
src/gallium/auxiliary/draw/draw_vs_exec.c
View file

@ -70,7 +70,7 @@ vs_exec_prepare( struct draw_vertex_shader *shader,
if (evs->machine->Tokens != shader->state.tokens) {
tgsi_exec_machine_bind_shader(evs->machine,
shader->state.tokens,
draw->vs.tgsi.sampler, NULL);
draw->vs.tgsi.sampler, draw->vs.tgsi.image);
}
}