diff options
| author | Tapani Pälli <[email protected]> | 2018-01-22 08:22:53 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2018-02-28 14:36:57 +0200 |
| commit | 5960023cf4abcd610ae646b094d04cb29f8b4986 (patch) | |
| tree | e7f602ab9223760859147b03745c78215da0cf3a /src/mesa/drivers | |
| parent | 4449a1f80dd3a37ee0fc6084ac93bc9f19f32580 (diff) | |
i965: use context priority definitions from gen_defines.h
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Chris Wilson <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_bufmgr.h | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h index 005ff19798e..0f2badd0069 100644 --- a/src/mesa/drivers/dri/i965/brw_bufmgr.h +++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h @@ -320,10 +320,6 @@ int brw_bo_wait(struct brw_bo *bo, int64_t timeout_ns); uint32_t brw_create_hw_context(struct brw_bufmgr *bufmgr); -#define BRW_CONTEXT_LOW_PRIORITY ((I915_CONTEXT_MIN_USER_PRIORITY-1)/2) -#define BRW_CONTEXT_MEDIUM_PRIORITY (I915_CONTEXT_DEFAULT_PRIORITY) -#define BRW_CONTEXT_HIGH_PRIORITY ((I915_CONTEXT_MAX_USER_PRIORITY+1)/2) - int brw_hw_context_set_priority(struct brw_bufmgr *bufmgr, uint32_t ctx_id, int priority); diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index ea1c78d1fe6..b9c3fa27bf0 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -76,6 +76,8 @@ #include "util/disk_cache.h" #include "isl/isl.h" +#include "common/gen_defines.h" + /*************************************** * Mesa's Driver Functions ***************************************/ @@ -982,14 +984,14 @@ brwCreateContext(gl_api api, return false; } - int hw_priority = BRW_CONTEXT_MEDIUM_PRIORITY; + int hw_priority = GEN_CONTEXT_MEDIUM_PRIORITY; if (ctx_config->attribute_mask & __DRIVER_CONTEXT_ATTRIB_PRIORITY) { switch (ctx_config->priority) { case __DRI_CTX_PRIORITY_LOW: - hw_priority = BRW_CONTEXT_LOW_PRIORITY; + hw_priority = GEN_CONTEXT_LOW_PRIORITY; break; case __DRI_CTX_PRIORITY_HIGH: - hw_priority = BRW_CONTEXT_HIGH_PRIORITY; + hw_priority = GEN_CONTEXT_HIGH_PRIORITY; break; } } diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index 9e0c15bad21..dfb889221d8 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -45,6 +45,8 @@ #include "util/disk_cache.h" #include "util/xmlpool.h" +#include "common/gen_defines.h" + static const __DRIconfigOptionsExtension brw_config_options = { .base = { __DRI_CONFIG_OPTIONS, 1 }, .xml = @@ -1462,14 +1464,14 @@ brw_query_renderer_integer(__DRIscreen *dri_screen, case __DRI2_RENDERER_HAS_CONTEXT_PRIORITY: value[0] = 0; if (brw_hw_context_set_priority(screen->bufmgr, - 0, BRW_CONTEXT_HIGH_PRIORITY) == 0) + 0, GEN_CONTEXT_HIGH_PRIORITY) == 0) value[0] |= __DRI2_RENDERER_HAS_CONTEXT_PRIORITY_HIGH; if (brw_hw_context_set_priority(screen->bufmgr, - 0, BRW_CONTEXT_LOW_PRIORITY) == 0) + 0, GEN_CONTEXT_LOW_PRIORITY) == 0) value[0] |= __DRI2_RENDERER_HAS_CONTEXT_PRIORITY_LOW; /* reset to default last, just in case */ if (brw_hw_context_set_priority(screen->bufmgr, - 0, BRW_CONTEXT_MEDIUM_PRIORITY) == 0) + 0, GEN_CONTEXT_MEDIUM_PRIORITY) == 0) value[0] |= __DRI2_RENDERER_HAS_CONTEXT_PRIORITY_MEDIUM; return 0; case __DRI2_RENDERER_HAS_FRAMEBUFFER_SRGB: |