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

gallium: add pipe_screen::finalize_nir

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Marek Olšák
2019-10-17 21:28:56 -04:00
parent 8a0dd0af3f
commit fb04e5da97
5 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/auxiliary/driver_ddebug/dd_screen.c
View File

@@ -411,6 +411,14 @@ dd_screen_memobj_destroy(struct pipe_screen *_screen,
* screen * screen
*/ */
static void
dd_screen_finalize_nir(struct pipe_screen *_screen, void *nir, bool optimize)
{
struct pipe_screen *screen = dd_screen(_screen)->screen;
screen->finalize_nir(screen, nir, optimize);
}
static void static void
dd_screen_destroy(struct pipe_screen *_screen) dd_screen_destroy(struct pipe_screen *_screen)
{ {
@@ -597,6 +605,7 @@ ddebug_screen_create(struct pipe_screen *screen)
SCR_INIT(get_compiler_options); SCR_INIT(get_compiler_options);
SCR_INIT(get_driver_uuid); SCR_INIT(get_driver_uuid);
SCR_INIT(get_device_uuid); SCR_INIT(get_device_uuid);
SCR_INIT(finalize_nir);
#undef SCR_INIT #undef SCR_INIT

5
src/gallium/auxiliary/driver_noop/noop_pipe.c
View File

@@ -514,6 +514,10 @@ static const void *noop_get_compiler_options(struct pipe_screen *pscreen,
return screen->get_compiler_options(screen, ir, shader); return screen->get_compiler_options(screen, ir, shader);
} }
static void noop_finalize_nir(struct pipe_screen *pscreen, void *nir, bool optimize)
{
}
struct pipe_screen *noop_screen_create(struct pipe_screen *oscreen) struct pipe_screen *noop_screen_create(struct pipe_screen *oscreen)
{ {
struct noop_pipe_screen *noop_screen; struct noop_pipe_screen *noop_screen;
@@ -553,6 +557,7 @@ struct pipe_screen *noop_screen_create(struct pipe_screen *oscreen)
screen->query_memory_info = noop_query_memory_info; screen->query_memory_info = noop_query_memory_info;
screen->get_disk_shader_cache = noop_get_disk_shader_cache; screen->get_disk_shader_cache = noop_get_disk_shader_cache;
screen->get_compiler_options = noop_get_compiler_options; screen->get_compiler_options = noop_get_compiler_options;
screen->finalize_nir = noop_finalize_nir;
return screen; return screen;
} }

9
src/gallium/auxiliary/driver_rbug/rbug_screen.c
View File

@@ -370,6 +370,14 @@ rbug_screen_fence_get_fd(struct pipe_screen *_screen,
return screen->fence_get_fd(screen, fence); return screen->fence_get_fd(screen, fence);
} }
static void
rbug_screen_finalize_nir(struct pipe_screen *_screen, void *nir, bool optimize)
{
struct pipe_screen *screen = rbug_screen(_screen)->screen;
return screen->finalize_nir(screen, nir, optimize);
}
bool bool
rbug_enabled() rbug_enabled()
{ {
@@ -422,6 +430,7 @@ rbug_screen_create(struct pipe_screen *screen)
rb_screen->base.fence_reference = rbug_screen_fence_reference; rb_screen->base.fence_reference = rbug_screen_fence_reference;
rb_screen->base.fence_finish = rbug_screen_fence_finish; rb_screen->base.fence_finish = rbug_screen_fence_finish;
rb_screen->base.fence_get_fd = rbug_screen_fence_get_fd; rb_screen->base.fence_get_fd = rbug_screen_fence_get_fd;
SCR_INIT(finalize_nir);
rb_screen->screen = screen; rb_screen->screen = screen;

9
src/gallium/auxiliary/driver_trace/tr_screen.c
View File

@@ -643,6 +643,14 @@ trace_screen_get_timestamp(struct pipe_screen *_screen)
return result; return result;
} }
static void
trace_screen_finalize_nir(struct pipe_screen *_screen, void *nir, bool optimize)
{
struct pipe_screen *screen = trace_screen(_screen)->screen;
screen->finalize_nir(screen, nir, optimize);
}
static void static void
trace_screen_destroy(struct pipe_screen *_screen) trace_screen_destroy(struct pipe_screen *_screen)
{ {
@@ -722,6 +730,7 @@ trace_screen_create(struct pipe_screen *screen)
tr_scr->base.get_timestamp = trace_screen_get_timestamp; tr_scr->base.get_timestamp = trace_screen_get_timestamp;
SCR_INIT(get_driver_uuid); SCR_INIT(get_driver_uuid);
SCR_INIT(get_device_uuid); SCR_INIT(get_device_uuid);
SCR_INIT(finalize_nir);
tr_scr->screen = screen; tr_scr->screen = screen;

11
src/gallium/include/pipe/p_screen.h
View File

@@ -500,6 +500,17 @@ struct pipe_screen {
struct pipe_resource *resource, struct pipe_resource *resource,
unsigned int nrects, unsigned int nrects,
const struct pipe_box *rects); const struct pipe_box *rects);
/**
* Run driver-specific NIR lowering and optimization passes.
*
* State trackers should call this before passing shaders to drivers,
* and ideally also before shader caching.
*
* \param optimize Whether the input shader hasn't been optimized and
* should be.
*/
void (*finalize_nir)(struct pipe_screen *screen, void *nir, bool optimize);
}; };