Module: Mesa Branch: master Commit: 962cc1bd17cbe34101c647c3e8bb72986810c652 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=962cc1bd17cbe34101c647c3e8bb72986810c652
Author: Kenneth Graunke <[email protected]> Date: Thu Sep 21 13:45:27 2017 -0700 i965: Use atomic ops in get_new_program_id(). We have a nice utility function for this, which eliminates the need for locking stuff. This isn't really performance critical, but it's less code to use the atomic. p_atomic_inc_return does pre-increment rather than post-increment, so we change screen->program_id to be initialized to 0 instead of 1. At which point, we can just delete the initialization because intel_screen is rzalloc'd. Reviewed-by: Chris Wilson <[email protected]> --- src/mesa/drivers/dri/i965/brw_program.c | 6 +----- src/mesa/drivers/dri/i965/intel_screen.c | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 9303dc85b9..fa0ce838fa 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -127,11 +127,7 @@ brw_create_nir(struct brw_context *brw, static unsigned get_new_program_id(struct intel_screen *screen) { - static pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_lock(&m); - unsigned id = screen->program_id++; - pthread_mutex_unlock(&m); - return id; + return p_atomic_inc_return(&screen->program_id); } static struct gl_program *brwNewProgram(struct gl_context *ctx, GLenum target, diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index bc2bba00b6..bd1365f232 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -2510,7 +2510,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen) screen->compiler->shader_debug_log = shader_debug_log_mesa; screen->compiler->shader_perf_log = shader_perf_log_mesa; screen->compiler->constant_buffer_0_is_relative = devinfo->gen < 8; - screen->program_id = 1; screen->has_exec_fence = intel_get_boolean(screen, I915_PARAM_HAS_EXEC_FENCE); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
