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

intel/i965: make gen_device_info mutable

Browse Source 
Make gen_device_info a mutable structure so we can update the fields that
can be refined by querying the kernel (like subslices and EU numbers).

This patch does not make any functional change, it just makes
gen_get_device_info() fill a structure rather than returning a const
pointer.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Lionel Landwerlin
2016-09-22 14:58:11 +03:00
parent e60928f4c4
commit bc24590f0c
25 changed files with 111 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/intel/common/gen_device_info.c
View File

@@ -487,21 +487,20 @@ static const struct gen_device_info gen_device_info_kbl_gt4 = {
.num_slices = 3, .num_slices = 3,
}; };
const struct gen_device_info * const bool
gen_get_device_info(int devid) gen_get_device_info(int devid, struct gen_device_info *devinfo)
{ {
const struct gen_device_info *devinfo;
switch (devid) { switch (devid) {
#undef CHIPSET #undef CHIPSET
#define CHIPSET(id, family, name) \ #define CHIPSET(id, family, name) \
case id: devinfo = &gen_device_info_##family; break; case id: *devinfo = gen_device_info_##family; break;
#include "pci_ids/i965_pci_ids.h" #include "pci_ids/i965_pci_ids.h"
default: default:
fprintf(stderr, "i965_dri.so does not support the 0x%x PCI ID.\n", devid); fprintf(stderr, "i965_dri.so does not support the 0x%x PCI ID.\n", devid);
return NULL; return false;
} }
return devinfo; return true;
} }
const char * const char *

2
src/intel/common/gen_device_info.h
View File

@@ -143,5 +143,5 @@ struct gen_device_info
/** @} */ /** @} */
}; };
const struct gen_device_info *gen_get_device_info(int devid); const bool gen_get_device_info(int devid, struct gen_device_info *devinfo);
const char *gen_get_device_name(int devid); const char *gen_get_device_name(int devid);

18
src/intel/isl/tests/isl_surf_get_image_offset_test.c
View File

@@ -124,9 +124,11 @@ test_bdw_2d_r8g8b8a8_unorm_512x512_array01_samples01_noaux_tiley0(void)
{ {
bool ok; bool ok;
struct gen_device_info devinfo;
t_assert(gen_get_device_info(BDW_GT2_DEVID, &devinfo));
struct isl_device dev; struct isl_device dev;
isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID), isl_device_init(&dev, &devinfo, /*bit6_swizzle*/ false);
/*bit6_swizzle*/ false);
struct isl_surf surf; struct isl_surf surf;
ok = isl_surf_init(&dev, &surf, ok = isl_surf_init(&dev, &surf,
@@ -170,9 +172,11 @@ test_bdw_2d_r8g8b8a8_unorm_1024x1024_array06_samples01_noaux_tiley0(void)
{ {
bool ok; bool ok;
struct gen_device_info devinfo;
t_assert(gen_get_device_info(BDW_GT2_DEVID, &devinfo));
struct isl_device dev; struct isl_device dev;
isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID), isl_device_init(&dev, &devinfo, /*bit6_swizzle*/ false);
/*bit6_swizzle*/ false);
struct isl_surf surf; struct isl_surf surf;
ok = isl_surf_init(&dev, &surf, ok = isl_surf_init(&dev, &surf,
@@ -229,9 +233,11 @@ test_bdw_3d_r8g8b8a8_unorm_256x256x256_levels09_tiley0(void)
{ {
bool ok; bool ok;
struct gen_device_info devinfo;
t_assert(gen_get_device_info(BDW_GT2_DEVID, &devinfo));
struct isl_device dev; struct isl_device dev;
isl_device_init(&dev, gen_get_device_info(BDW_GT2_DEVID), isl_device_init(&dev, &devinfo, /*bit6_swizzle*/ false);
/*bit6_swizzle*/ false);
struct isl_surf surf; struct isl_surf surf;
ok = isl_surf_init(&dev, &surf, ok = isl_surf_init(&dev, &surf,

4
src/intel/tools/disasm.c
View File

@@ -101,7 +101,9 @@ gen_disasm_create(int pciid)
if (gd == NULL) if (gd == NULL)
return NULL; return NULL;
gd->devinfo = *gen_get_device_info(pciid); if (!gen_get_device_info(pciid, &gd->devinfo))
return NULL;
brw_init_compaction_tables(&gd->devinfo); brw_init_compaction_tables(&gd->devinfo);
return gd; return gd;

57
src/intel/vulkan/anv_device.c
View File

@@ -77,19 +77,18 @@ anv_physical_device_init(struct anv_physical_device *device,
} }
device->name = gen_get_device_name(device->chipset_id); device->name = gen_get_device_name(device->chipset_id);
device->info = gen_get_device_info(device->chipset_id); if (!gen_get_device_info(device->chipset_id, &device->info)) {
if (!device->info) {
result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER); result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
goto fail; goto fail;
} }
if (device->info->is_haswell) { if (device->info.is_haswell) {
fprintf(stderr, "WARNING: Haswell Vulkan support is incomplete\n"); fprintf(stderr, "WARNING: Haswell Vulkan support is incomplete\n");
} else if (device->info->gen == 7 && !device->info->is_baytrail) { } else if (device->info.gen == 7 && !device->info.is_baytrail) {
fprintf(stderr, "WARNING: Ivy Bridge Vulkan support is incomplete\n"); fprintf(stderr, "WARNING: Ivy Bridge Vulkan support is incomplete\n");
} else if (device->info->gen == 7 && device->info->is_baytrail) { } else if (device->info.gen == 7 && device->info.is_baytrail) {
fprintf(stderr, "WARNING: Bay Trail Vulkan support is incomplete\n"); fprintf(stderr, "WARNING: Bay Trail Vulkan support is incomplete\n");
} else if (device->info->gen >= 8) { } else if (device->info.gen >= 8) {
/* Broadwell, Cherryview, Skylake, Broxton, Kabylake is as fully /* Broadwell, Cherryview, Skylake, Broxton, Kabylake is as fully
* supported as anything */ * supported as anything */
} else { } else {
@@ -99,7 +98,7 @@ anv_physical_device_init(struct anv_physical_device *device,
} }
device->cmd_parser_version = -1; device->cmd_parser_version = -1;
if (device->info->gen == 7) { if (device->info.gen == 7) {
device->cmd_parser_version = device->cmd_parser_version =
anv_gem_get_param(fd, I915_PARAM_CMD_PARSER_VERSION); anv_gem_get_param(fd, I915_PARAM_CMD_PARSER_VERSION);
if (device->cmd_parser_version == -1) { if (device->cmd_parser_version == -1) {
@@ -127,7 +126,7 @@ anv_physical_device_init(struct anv_physical_device *device,
goto fail; goto fail;
} }
if (!device->info->has_llc && if (!device->info.has_llc &&
anv_gem_get_param(fd, I915_PARAM_MMAP_VERSION) < 1) { anv_gem_get_param(fd, I915_PARAM_MMAP_VERSION) < 1) {
result = vk_errorf(VK_ERROR_INITIALIZATION_FAILED, result = vk_errorf(VK_ERROR_INITIALIZATION_FAILED,
"kernel missing wc mmap"); "kernel missing wc mmap");
@@ -136,14 +135,14 @@ anv_physical_device_init(struct anv_physical_device *device,
bool swizzled = anv_gem_get_bit6_swizzle(fd, I915_TILING_X); bool swizzled = anv_gem_get_bit6_swizzle(fd, I915_TILING_X);
device->max_vs_threads = device->info->max_vs_threads; device->max_vs_threads = device->info.max_vs_threads;
device->max_hs_threads = device->info->max_hs_threads; device->max_hs_threads = device->info.max_hs_threads;
device->max_ds_threads = device->info->max_ds_threads; device->max_ds_threads = device->info.max_ds_threads;
device->max_gs_threads = device->info->max_gs_threads; device->max_gs_threads = device->info.max_gs_threads;
device->max_wm_threads = device->info->max_wm_threads; device->max_wm_threads = device->info.max_wm_threads;
/* GENs prior to 8 do not support EU/Subslice info */ /* GENs prior to 8 do not support EU/Subslice info */
if (device->info->gen >= 8) { if (device->info.gen >= 8) {
device->subslice_total = anv_gem_get_param(fd, I915_PARAM_SUBSLICE_TOTAL); device->subslice_total = anv_gem_get_param(fd, I915_PARAM_SUBSLICE_TOTAL);
device->eu_total = anv_gem_get_param(fd, I915_PARAM_EU_TOTAL); device->eu_total = anv_gem_get_param(fd, I915_PARAM_EU_TOTAL);
@@ -155,27 +154,27 @@ anv_physical_device_init(struct anv_physical_device *device,
fprintf(stderr, "WARNING: Kernel 4.1 required to properly" fprintf(stderr, "WARNING: Kernel 4.1 required to properly"
" query GPU properties.\n"); " query GPU properties.\n");
} }
} else if (device->info->gen == 7) { } else if (device->info.gen == 7) {
device->subslice_total = 1 << (device->info->gt - 1); device->subslice_total = 1 << (device->info.gt - 1);
} }
if (device->info->is_cherryview && if (device->info.is_cherryview &&
device->subslice_total > 0 && device->eu_total > 0) { device->subslice_total > 0 && device->eu_total > 0) {
/* Logical CS threads = EUs per subslice * 7 threads per EU */ /* Logical CS threads = EUs per subslice * 7 threads per EU */
device->max_cs_threads = device->eu_total / device->subslice_total * 7; device->max_cs_threads = device->eu_total / device->subslice_total * 7;
/* Fuse configurations may give more threads than expected, never less. */ /* Fuse configurations may give more threads than expected, never less. */
if (device->max_cs_threads < device->info->max_cs_threads) if (device->max_cs_threads < device->info.max_cs_threads)
device->max_cs_threads = device->info->max_cs_threads; device->max_cs_threads = device->info.max_cs_threads;
} else { } else {
device->max_cs_threads = device->info->max_cs_threads; device->max_cs_threads = device->info.max_cs_threads;
} }
close(fd); close(fd);
brw_process_intel_debug_variable(); brw_process_intel_debug_variable();
device->compiler = brw_compiler_create(NULL, device->info); device->compiler = brw_compiler_create(NULL, &device->info);
if (device->compiler == NULL) { if (device->compiler == NULL) {
result = vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); result = vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
goto fail; goto fail;
@@ -188,7 +187,7 @@ anv_physical_device_init(struct anv_physical_device *device,
goto fail; goto fail;
/* XXX: Actually detect bit6 swizzling */ /* XXX: Actually detect bit6 swizzling */
isl_device_init(&device->isl_dev, device->info, swizzled); isl_device_init(&device->isl_dev, &device->info, swizzled);
return VK_SUCCESS; return VK_SUCCESS;
@@ -428,9 +427,9 @@ void anv_GetPhysicalDeviceFeatures(
.alphaToOne = true, .alphaToOne = true,
.multiViewport = true, .multiViewport = true,
.samplerAnisotropy = false, /* FINISHME */ .samplerAnisotropy = false, /* FINISHME */
.textureCompressionETC2 = pdevice->info->gen >= 8 || .textureCompressionETC2 = pdevice->info.gen >= 8 ||
pdevice->info->is_baytrail, pdevice->info.is_baytrail,
.textureCompressionASTC_LDR = pdevice->info->gen >= 9, /* FINISHME CHV */ .textureCompressionASTC_LDR = pdevice->info.gen >= 9, /* FINISHME CHV */
.textureCompressionBC = true, .textureCompressionBC = true,
.occlusionQueryPrecise = true, .occlusionQueryPrecise = true,
.pipelineStatisticsQuery = false, .pipelineStatisticsQuery = false,
@@ -473,7 +472,7 @@ void anv_GetPhysicalDeviceProperties(
VkPhysicalDeviceProperties* pProperties) VkPhysicalDeviceProperties* pProperties)
{ {
ANV_FROM_HANDLE(anv_physical_device, pdevice, physicalDevice); ANV_FROM_HANDLE(anv_physical_device, pdevice, physicalDevice);
const struct gen_device_info *devinfo = pdevice->info; const struct gen_device_info *devinfo = &pdevice->info;
const float time_stamp_base = devinfo->gen >= 9 ? 83.333 : 80.0; const float time_stamp_base = devinfo->gen >= 9 ? 83.333 : 80.0;
@@ -645,7 +644,7 @@ void anv_GetPhysicalDeviceMemoryProperties(
*/ */
heap_size = 3 * physical_device->aperture_size / 4; heap_size = 3 * physical_device->aperture_size / 4;
if (physical_device->info->has_llc) { if (physical_device->info.has_llc) {
/* Big core GPUs share LLC with the CPU and thus one memory type can be /* Big core GPUs share LLC with the CPU and thus one memory type can be
* both cached and coherent at the same time. * both cached and coherent at the same time.
*/ */
@@ -861,7 +860,7 @@ VkResult anv_CreateDevice(
return vk_error(VK_ERROR_EXTENSION_NOT_PRESENT); return vk_error(VK_ERROR_EXTENSION_NOT_PRESENT);
} }
anv_set_dispatch_devinfo(physical_device->info); anv_set_dispatch_devinfo(&physical_device->info);
device = anv_alloc2(&physical_device->instance->alloc, pAllocator, device = anv_alloc2(&physical_device->instance->alloc, pAllocator,
sizeof(*device), 8, sizeof(*device), 8,
@@ -891,7 +890,7 @@ VkResult anv_CreateDevice(
goto fail_fd; goto fail_fd;
} }
device->info = *physical_device->info; device->info = physical_device->info;
device->isl_dev = physical_device->isl_dev; device->isl_dev = physical_device->isl_dev;
/* On Broadwell and later, we can use batch chaining to more efficiently /* On Broadwell and later, we can use batch chaining to more efficiently

16
src/intel/vulkan/anv_formats.c
View File

@@ -365,8 +365,8 @@ anv_physical_device_get_format_properties(struct anv_physical_device *physical_d
VkFormat format, VkFormat format,
VkFormatProperties *out_properties) VkFormatProperties *out_properties)
{ {
int gen = physical_device->info->gen * 10; int gen = physical_device->info.gen * 10;
if (physical_device->info->is_haswell) if (physical_device->info.is_haswell)
gen += 5; gen += 5;
VkFormatFeatureFlags linear = 0, tiled = 0, buffer = 0; VkFormatFeatureFlags linear = 0, tiled = 0, buffer = 0;
@@ -374,25 +374,25 @@ anv_physical_device_get_format_properties(struct anv_physical_device *physical_d
/* Nothing to do here */ /* Nothing to do here */
} else if (vk_format_is_depth_or_stencil(format)) { } else if (vk_format_is_depth_or_stencil(format)) {
tiled |= VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT; tiled |= VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT;
if (physical_device->info->gen >= 8) if (physical_device->info.gen >= 8)
tiled |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT; tiled |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT;
tiled |= VK_FORMAT_FEATURE_BLIT_SRC_BIT | tiled |= VK_FORMAT_FEATURE_BLIT_SRC_BIT |
VK_FORMAT_FEATURE_BLIT_DST_BIT; VK_FORMAT_FEATURE_BLIT_DST_BIT;
} else { } else {
struct anv_format linear_fmt, tiled_fmt; struct anv_format linear_fmt, tiled_fmt;
linear_fmt = anv_get_format(physical_device->info, format, linear_fmt = anv_get_format(&physical_device->info, format,
VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_ASPECT_COLOR_BIT,
VK_IMAGE_TILING_LINEAR); VK_IMAGE_TILING_LINEAR);
tiled_fmt = anv_get_format(physical_device->info, format, tiled_fmt = anv_get_format(&physical_device->info, format,
VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_ASPECT_COLOR_BIT,
VK_IMAGE_TILING_OPTIMAL); VK_IMAGE_TILING_OPTIMAL);
linear = get_image_format_properties(physical_device->info, linear = get_image_format_properties(&physical_device->info,
linear_fmt.isl_format, linear_fmt); linear_fmt.isl_format, linear_fmt);
tiled = get_image_format_properties(physical_device->info, tiled = get_image_format_properties(&physical_device->info,
linear_fmt.isl_format, tiled_fmt); linear_fmt.isl_format, tiled_fmt);
buffer = get_buffer_format_properties(physical_device->info, buffer = get_buffer_format_properties(&physical_device->info,
linear_fmt.isl_format); linear_fmt.isl_format);
/* XXX: We handle 3-channel formats by switching them out for RGBX or /* XXX: We handle 3-channel formats by switching them out for RGBX or

2
src/intel/vulkan/anv_private.h
View File

@@ -564,7 +564,7 @@ struct anv_physical_device {
uint32_t chipset_id; uint32_t chipset_id;
char path[20]; char path[20];
const char * name; const char * name;
const struct gen_device_info * info; struct gen_device_info info;
uint64_t aperture_size; uint64_t aperture_size;
struct brw_compiler * compiler; struct brw_compiler * compiler;
struct isl_device isl_dev; struct isl_device isl_dev;

4
src/mesa/drivers/dri/i965/brw_clip.c
View File

@@ -61,7 +61,7 @@ static void compile_clip_prog( struct brw_context *brw,
/* Begin the compilation: /* Begin the compilation:
*/ */
brw_init_codegen(brw->screen->devinfo, &c.func, mem_ctx); brw_init_codegen(&brw->screen->devinfo, &c.func, mem_ctx);
c.func.single_program_flow = 1; c.func.single_program_flow = 1;
@@ -116,7 +116,7 @@ static void compile_clip_prog( struct brw_context *brw,
if (unlikely(INTEL_DEBUG & DEBUG_CLIP)) { if (unlikely(INTEL_DEBUG & DEBUG_CLIP)) {
fprintf(stderr, "clip:\n"); fprintf(stderr, "clip:\n");
brw_disassemble(brw->screen->devinfo, c.func.store, brw_disassemble(&brw->screen->devinfo, c.func.store,
0, program_size, stderr); 0, program_size, stderr);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }

6
src/mesa/drivers/dri/i965/brw_context.c
View File

@@ -207,7 +207,7 @@ intel_texture_view_requires_resolve(struct brw_context *brw,
const uint32_t brw_format = brw_format_for_mesa_format(intel_tex->_Format); const uint32_t brw_format = brw_format_for_mesa_format(intel_tex->_Format);
if (isl_format_supports_lossless_compression(brw->screen->devinfo, if (isl_format_supports_lossless_compression(&brw->screen->devinfo,
brw_format)) brw_format))
return false; return false;
@@ -806,7 +806,7 @@ brw_initialize_cs_context_constants(struct brw_context *brw)
{ {
struct gl_context *ctx = &brw->ctx; struct gl_context *ctx = &brw->ctx;
const struct intel_screen *screen = brw->screen; const struct intel_screen *screen = brw->screen;
const struct gen_device_info *devinfo = screen->devinfo; const struct gen_device_info *devinfo = &screen->devinfo;
/* FINISHME: Do this for all platforms that the kernel supports */ /* FINISHME: Do this for all platforms that the kernel supports */
if (brw->is_cherryview && if (brw->is_cherryview &&
@@ -919,7 +919,7 @@ brwCreateContext(gl_api api,
{ {
struct gl_context *shareCtx = (struct gl_context *) sharedContextPrivate; struct gl_context *shareCtx = (struct gl_context *) sharedContextPrivate;
struct intel_screen *screen = driContextPriv->driScreenPriv->driverPrivate; struct intel_screen *screen = driContextPriv->driScreenPriv->driverPrivate;
const struct gen_device_info *devinfo = screen->devinfo; const struct gen_device_info *devinfo = &screen->devinfo;
struct dd_function_table functions; struct dd_function_table functions;
/* Only allow the __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS flag if the kernel /* Only allow the __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS flag if the kernel

2
src/mesa/drivers/dri/i965/brw_cs.c
View File

@@ -84,7 +84,7 @@ brw_codegen_cs_prog(struct brw_context *brw,
prog_data.base.total_shared = prog->Comp.SharedSize; prog_data.base.total_shared = prog->Comp.SharedSize;
} }
assign_cs_binding_table_offsets(brw->screen->devinfo, prog, assign_cs_binding_table_offsets(&brw->screen->devinfo, prog,
&cp->program.Base, &prog_data); &cp->program.Base, &prog_data);
/* Allocate the references to the uniforms that will end up in the /* Allocate the references to the uniforms that will end up in the

4
src/mesa/drivers/dri/i965/brw_ff_gs.c
View File

@@ -63,7 +63,7 @@ brw_codegen_ff_gs_prog(struct brw_context *brw,
/* Begin the compilation: /* Begin the compilation:
*/ */
brw_init_codegen(brw->screen->devinfo, &c.func, mem_ctx); brw_init_codegen(&brw->screen->devinfo, &c.func, mem_ctx);
c.func.single_program_flow = 1; c.func.single_program_flow = 1;
@@ -135,7 +135,7 @@ brw_codegen_ff_gs_prog(struct brw_context *brw,
if (unlikely(INTEL_DEBUG & DEBUG_GS)) { if (unlikely(INTEL_DEBUG & DEBUG_GS)) {
fprintf(stderr, "gs:\n"); fprintf(stderr, "gs:\n");
brw_disassemble(brw->screen->devinfo, c.func.store, brw_disassemble(&brw->screen->devinfo, c.func.store,
0, program_size, stderr); 0, program_size, stderr);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }

4
src/mesa/drivers/dri/i965/brw_gs.c
View File

@@ -105,7 +105,7 @@ brw_codegen_gs_prog(struct brw_context *brw,
memset(&prog_data, 0, sizeof(prog_data)); memset(&prog_data, 0, sizeof(prog_data));
assign_gs_binding_table_offsets(brw->screen->devinfo, prog, assign_gs_binding_table_offsets(&brw->screen->devinfo, prog,
&gp->program.Base, &prog_data); &gp->program.Base, &prog_data);
/* Allocate the references to the uniforms that will end up in the /* Allocate the references to the uniforms that will end up in the
@@ -139,7 +139,7 @@ brw_codegen_gs_prog(struct brw_context *brw,
((1 << gp->program.Base.CullDistanceArraySize) - 1) << ((1 << gp->program.Base.CullDistanceArraySize) - 1) <<
gp->program.Base.ClipDistanceArraySize; gp->program.Base.ClipDistanceArraySize;
brw_compute_vue_map(brw->screen->devinfo, brw_compute_vue_map(&brw->screen->devinfo,
&prog_data.base.vue_map, outputs_written, &prog_data.base.vue_map, outputs_written,
prog->SeparateShader); prog->SeparateShader);

4
src/mesa/drivers/dri/i965/brw_sf.c
View File

@@ -59,7 +59,7 @@ static void compile_sf_prog( struct brw_context *brw,
mem_ctx = ralloc_context(NULL); mem_ctx = ralloc_context(NULL);
/* Begin the compilation: /* Begin the compilation:
*/ */
brw_init_codegen(brw->screen->devinfo, &c.func, mem_ctx); brw_init_codegen(&brw->screen->devinfo, &c.func, mem_ctx);
c.key = *key; c.key = *key;
c.vue_map = brw->vue_map_geom_out; c.vue_map = brw->vue_map_geom_out;
@@ -118,7 +118,7 @@ static void compile_sf_prog( struct brw_context *brw,
if (unlikely(INTEL_DEBUG & DEBUG_SF)) { if (unlikely(INTEL_DEBUG & DEBUG_SF)) {
fprintf(stderr, "sf:\n"); fprintf(stderr, "sf:\n");
brw_disassemble(brw->screen->devinfo, brw_disassemble(&brw->screen->devinfo,
c.func.store, 0, program_size, stderr); c.func.store, 0, program_size, stderr);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }

2
src/mesa/drivers/dri/i965/brw_state_dump.c
View File

@@ -765,7 +765,7 @@ dump_prog_cache(struct brw_context *brw)
} }
fprintf(stderr, "%s:\n", name); fprintf(stderr, "%s:\n", name);
brw_disassemble(brw->screen->devinfo, brw->cache.bo->virtual, brw_disassemble(&brw->screen->devinfo, brw->cache.bo->virtual,
item->offset, item->size, stderr); item->offset, item->size, stderr);
} }
} }

2
src/mesa/drivers/dri/i965/brw_surface_formats.c
View File

@@ -288,7 +288,7 @@ brw_format_for_mesa_format(mesa_format mesa_format)
void void
brw_init_surface_formats(struct brw_context *brw) brw_init_surface_formats(struct brw_context *brw)
{ {
const struct gen_device_info *devinfo = brw->screen->devinfo; const struct gen_device_info *devinfo = &brw->screen->devinfo;
struct gl_context *ctx = &brw->ctx; struct gl_context *ctx = &brw->ctx;
int gen; int gen;
mesa_format format; mesa_format format;

2
src/mesa/drivers/dri/i965/brw_tes.c
View File

@@ -83,7 +83,7 @@ brw_codegen_tes_prog(struct brw_context *brw,
struct brw_tes_prog_key *key) struct brw_tes_prog_key *key)
{ {
const struct brw_compiler *compiler = brw->screen->compiler; const struct brw_compiler *compiler = brw->screen->compiler;
const struct gen_device_info *devinfo = brw->screen->devinfo; const struct gen_device_info *devinfo = &brw->screen->devinfo;
struct brw_stage_state *stage_state = &brw->tes.base; struct brw_stage_state *stage_state = &brw->tes.base;
nir_shader *nir = tep->program.Base.nir; nir_shader *nir = tep->program.Base.nir;
struct brw_tes_prog_data prog_data; struct brw_tes_prog_data prog_data;

4
src/mesa/drivers/dri/i965/brw_vs.c
View File

@@ -112,7 +112,7 @@ brw_codegen_vs_prog(struct brw_context *brw,
mem_ctx = ralloc_context(NULL); mem_ctx = ralloc_context(NULL);
brw_assign_common_binding_table_offsets(MESA_SHADER_VERTEX, brw_assign_common_binding_table_offsets(MESA_SHADER_VERTEX,
brw->screen->devinfo, &brw->screen->devinfo,
prog, &vp->program.Base, prog, &vp->program.Base,
&prog_data.base.base, 0); &prog_data.base.base, 0);
@@ -160,7 +160,7 @@ brw_codegen_vs_prog(struct brw_context *brw,
((1 << vp->program.Base.CullDistanceArraySize) - 1) << ((1 << vp->program.Base.CullDistanceArraySize) - 1) <<
vp->program.Base.ClipDistanceArraySize; vp->program.Base.ClipDistanceArraySize;
brw_compute_vue_map(brw->screen->devinfo, brw_compute_vue_map(&brw->screen->devinfo,
&prog_data.base.vue_map, outputs_written, &prog_data.base.vue_map, outputs_written,
prog ? prog->SeparateShader || prog ? prog->SeparateShader ||
prog->_LinkedShaders[MESA_SHADER_TESS_EVAL] prog->_LinkedShaders[MESA_SHADER_TESS_EVAL]

2
src/mesa/drivers/dri/i965/brw_wm.c
View File

@@ -97,7 +97,7 @@ brw_codegen_wm_prog(struct brw_context *brw,
if (!prog) if (!prog)
prog_data.base.use_alt_mode = true; prog_data.base.use_alt_mode = true;
assign_fs_binding_table_offsets(brw->screen->devinfo, prog, assign_fs_binding_table_offsets(&brw->screen->devinfo, prog,
&fp->program.Base, key, &prog_data); &fp->program.Base, key, &prog_data);
/* Allocate the references to the uniforms that will end up in the /* Allocate the references to the uniforms that will end up in the

8
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View File

@@ -94,7 +94,7 @@ brw_emit_surface_state(struct brw_context *brw,
surf.dim = get_isl_surf_dim(target); surf.dim = get_isl_surf_dim(target);
const enum isl_dim_layout dim_layout = const enum isl_dim_layout dim_layout =
get_isl_dim_layout(brw->screen->devinfo, mt->tiling, target); get_isl_dim_layout(&brw->screen->devinfo, mt->tiling, target);
if (surf.dim_layout != dim_layout) { if (surf.dim_layout != dim_layout) {
/* The layout of the specified texture target is not compatible with the /* The layout of the specified texture target is not compatible with the
@@ -441,7 +441,7 @@ brw_texture_view_sane(const struct brw_context *brw,
if (!intel_miptree_is_lossless_compressed(brw, mt)) if (!intel_miptree_is_lossless_compressed(brw, mt))
return true; return true;
if (isl_format_supports_lossless_compression(brw->screen->devinfo, if (isl_format_supports_lossless_compression(&brw->screen->devinfo,
format)) format))
return true; return true;
@@ -1150,7 +1150,7 @@ update_renderbuffer_read_surfaces(struct brw_context *brw)
if (irb) { if (irb) {
const unsigned format = brw->render_target_format[ const unsigned format = brw->render_target_format[
_mesa_get_render_format(ctx, intel_rb_format(irb))]; _mesa_get_render_format(ctx, intel_rb_format(irb))];
assert(isl_format_supports_sampling(brw->screen->devinfo, assert(isl_format_supports_sampling(&brw->screen->devinfo,
format)); format));
/* Override the target of the texture if the render buffer is a /* Override the target of the texture if the render buffer is a
@@ -1577,7 +1577,7 @@ const struct brw_tracked_state brw_cs_image_surfaces = {
static uint32_t static uint32_t
get_image_format(struct brw_context *brw, mesa_format format, GLenum access) get_image_format(struct brw_context *brw, mesa_format format, GLenum access)
{ {
const struct gen_device_info *devinfo = brw->screen->devinfo; const struct gen_device_info *devinfo = &brw->screen->devinfo;
uint32_t hw_format = brw_format_for_mesa_format(format); uint32_t hw_format = brw_format_for_mesa_format(format);
if (access == GL_WRITE_ONLY) { if (access == GL_WRITE_ONLY) {
return hw_format; return hw_format;

2
src/mesa/drivers/dri/i965/gen7_cs_state.c
View File

@@ -46,7 +46,7 @@ brw_upload_cs_state(struct brw_context *brw)
struct brw_stage_state *stage_state = &brw->cs.base; struct brw_stage_state *stage_state = &brw->cs.base;
struct brw_cs_prog_data *cs_prog_data = brw->cs.prog_data; struct brw_cs_prog_data *cs_prog_data = brw->cs.prog_data;
struct brw_stage_prog_data *prog_data = &cs_prog_data->base; struct brw_stage_prog_data *prog_data = &cs_prog_data->base;
const struct gen_device_info *devinfo = brw->screen->devinfo; const struct gen_device_info *devinfo = &brw->screen->devinfo;
if (INTEL_DEBUG & DEBUG_SHADER_TIME) { if (INTEL_DEBUG & DEBUG_SHADER_TIME) {
brw_emit_buffer_surface_state( brw_emit_buffer_surface_state(

8
src/mesa/drivers/dri/i965/gen7_l3_state.c
View File

@@ -58,7 +58,7 @@ get_pipeline_state_l3_weights(const struct brw_context *brw)
needs_slm |= prog_data && prog_data->total_shared; needs_slm |= prog_data && prog_data->total_shared;
} }
return gen_get_default_l3_weights(brw->screen->devinfo, return gen_get_default_l3_weights(&brw->screen->devinfo,
needs_dc, needs_slm); needs_dc, needs_slm);
} }
@@ -197,7 +197,7 @@ setup_l3_config(struct brw_context *brw, const struct gen_l3_config *cfg)
static void static void
update_urb_size(struct brw_context *brw, const struct gen_l3_config *cfg) update_urb_size(struct brw_context *brw, const struct gen_l3_config *cfg)
{ {
const struct gen_device_info *devinfo = brw->screen->devinfo; const struct gen_device_info *devinfo = &brw->screen->devinfo;
const unsigned sz = gen_get_l3_config_urb_size(devinfo, cfg); const unsigned sz = gen_get_l3_config_urb_size(devinfo, cfg);
if (brw->urb.size != sz) { if (brw->urb.size != sz) {
@@ -230,7 +230,7 @@ emit_l3_state(struct brw_context *brw)
if (dw > dw_threshold && brw->can_do_pipelined_register_writes) { if (dw > dw_threshold && brw->can_do_pipelined_register_writes) {
const struct gen_l3_config *const cfg = const struct gen_l3_config *const cfg =
gen_get_l3_config(brw->screen->devinfo, w); gen_get_l3_config(&brw->screen->devinfo, w);
setup_l3_config(brw, cfg); setup_l3_config(brw, cfg);
update_urb_size(brw, cfg); update_urb_size(brw, cfg);
@@ -292,7 +292,7 @@ const struct brw_tracked_state gen7_l3_state = {
void void
gen7_restore_default_l3_config(struct brw_context *brw) gen7_restore_default_l3_config(struct brw_context *brw)
{ {
const struct gen_device_info *devinfo = brw->screen->devinfo; const struct gen_device_info *devinfo = &brw->screen->devinfo;
const struct gen_l3_config *const cfg = gen_get_default_l3_config(devinfo); const struct gen_l3_config *const cfg = gen_get_default_l3_config(devinfo);
if (cfg != brw->l3.config && brw->can_do_pipelined_register_writes) { if (cfg != brw->l3.config && brw->can_do_pipelined_register_writes) {

2
src/mesa/drivers/dri/i965/gen7_urb.c
View File

@@ -202,7 +202,7 @@ void
gen7_upload_urb(struct brw_context *brw, unsigned vs_size, gen7_upload_urb(struct brw_context *brw, unsigned vs_size,
bool gs_present, bool tess_present) bool gs_present, bool tess_present)
{ {
const struct gen_device_info *devinfo = brw->screen->devinfo; const struct gen_device_info *devinfo = &brw->screen->devinfo;
const int push_size_kB = const int push_size_kB =
(brw->gen >= 8 || (brw->is_haswell && brw->gt == 3)) ? 32 : 16; (brw->gen >= 8 || (brw->is_haswell && brw->gt == 3)) ? 32 : 16;

4
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View File

@@ -262,7 +262,7 @@ intel_miptree_supports_non_msrt_fast_clear(struct brw_context *brw,
if (brw->gen >= 9) { if (brw->gen >= 9) {
mesa_format linear_format = _mesa_get_srgb_format_linear(mt->format); mesa_format linear_format = _mesa_get_srgb_format_linear(mt->format);
const uint32_t brw_format = brw_format_for_mesa_format(linear_format); const uint32_t brw_format = brw_format_for_mesa_format(linear_format);
return isl_format_supports_lossless_compression(brw->screen->devinfo, return isl_format_supports_lossless_compression(&brw->screen->devinfo,
brw_format); brw_format);
} else } else
return true; return true;
@@ -3063,7 +3063,7 @@ intel_miptree_get_isl_surf(struct brw_context *brw,
struct isl_surf *surf) struct isl_surf *surf)
{ {
surf->dim = get_isl_surf_dim(mt->target); surf->dim = get_isl_surf_dim(mt->target);
surf->dim_layout = get_isl_dim_layout(brw->screen->devinfo, surf->dim_layout = get_isl_dim_layout(&brw->screen->devinfo,
mt->tiling, mt->target); mt->tiling, mt->target);
if (mt->num_samples > 1) { if (mt->num_samples > 1) {

41
src/mesa/drivers/dri/i965/intel_screen.c
View File

@@ -1088,7 +1088,7 @@ intelCreateBuffer(__DRIscreen *dri_screen,
if (mesaVis->depthBits == 24) { if (mesaVis->depthBits == 24) {
assert(mesaVis->stencilBits == 8); assert(mesaVis->stencilBits == 8);
if (screen->devinfo->has_hiz_and_separate_stencil) { if (screen->devinfo.has_hiz_and_separate_stencil) {
rb = intel_create_private_renderbuffer(MESA_FORMAT_Z24_UNORM_X8_UINT, rb = intel_create_private_renderbuffer(MESA_FORMAT_Z24_UNORM_X8_UINT,
num_samples); num_samples);
_mesa_add_renderbuffer(fb, BUFFER_DEPTH, &rb->Base.Base); _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &rb->Base.Base);
@@ -1141,7 +1141,7 @@ intelDestroyBuffer(__DRIdrawable * driDrawPriv)
static void static void
intel_detect_sseu(struct intel_screen *screen) intel_detect_sseu(struct intel_screen *screen)
{ {
assert(screen->devinfo->gen >= 8); assert(screen->devinfo.gen >= 8);
int ret; int ret;
screen->subslice_total = -1; screen->subslice_total = -1;
@@ -1278,13 +1278,13 @@ intel_supported_msaa_modes(const struct intel_screen *screen)
static const int gen6_modes[] = {4, 0, -1}; static const int gen6_modes[] = {4, 0, -1};
static const int gen4_modes[] = {0, -1}; static const int gen4_modes[] = {0, -1};
if (screen->devinfo->gen >= 9) { if (screen->devinfo.gen >= 9) {
return gen9_modes; return gen9_modes;
} else if (screen->devinfo->gen >= 8) { } else if (screen->devinfo.gen >= 8) {
return gen8_modes; return gen8_modes;
} else if (screen->devinfo->gen >= 7) { } else if (screen->devinfo.gen >= 7) {
return gen7_modes; return gen7_modes;
} else if (screen->devinfo->gen == 6) { } else if (screen->devinfo.gen == 6) {
return gen6_modes; return gen6_modes;
} else { } else {
return gen4_modes; return gen4_modes;
@@ -1309,7 +1309,7 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
static const uint8_t multisample_samples[2] = {4, 8}; static const uint8_t multisample_samples[2] = {4, 8};
struct intel_screen *screen = dri_screen->driverPrivate; struct intel_screen *screen = dri_screen->driverPrivate;
const struct gen_device_info *devinfo = screen->devinfo; const struct gen_device_info *devinfo = &screen->devinfo;
uint8_t depth_bits[4], stencil_bits[4]; uint8_t depth_bits[4], stencil_bits[4];
__DRIconfig **configs = NULL; __DRIconfig **configs = NULL;
@@ -1431,9 +1431,9 @@ static void
set_max_gl_versions(struct intel_screen *screen) set_max_gl_versions(struct intel_screen *screen)
{ {
__DRIscreen *dri_screen = screen->driScrnPriv; __DRIscreen *dri_screen = screen->driScrnPriv;
const bool has_astc = screen->devinfo->gen >= 9; const bool has_astc = screen->devinfo.gen >= 9;
switch (screen->devinfo->gen) { switch (screen->devinfo.gen) {
case 9: case 9:
case 8: case 8:
dri_screen->max_gl_core_version = 44; dri_screen->max_gl_core_version = 44;
@@ -1445,7 +1445,7 @@ set_max_gl_versions(struct intel_screen *screen)
dri_screen->max_gl_core_version = 33; dri_screen->max_gl_core_version = 33;
dri_screen->max_gl_compat_version = 30; dri_screen->max_gl_compat_version = 30;
dri_screen->max_gl_es1_version = 11; dri_screen->max_gl_es1_version = 11;
dri_screen->max_gl_es2_version = screen->devinfo->is_haswell ? 31 : 30; dri_screen->max_gl_es2_version = screen->devinfo.is_haswell ? 31 : 30;
break; break;
case 6: case 6:
dri_screen->max_gl_core_version = 33; dri_screen->max_gl_core_version = 33;
@@ -1573,8 +1573,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
return false; return false;
screen->deviceID = drm_intel_bufmgr_gem_get_devid(screen->bufmgr); screen->deviceID = drm_intel_bufmgr_gem_get_devid(screen->bufmgr);
screen->devinfo = gen_get_device_info(screen->deviceID); if (!gen_get_device_info(screen->deviceID, &screen->devinfo))
if (!screen->devinfo)
return false; return false;
brw_process_intel_debug_variable(); brw_process_intel_debug_variable();
@@ -1582,7 +1581,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
if (INTEL_DEBUG & DEBUG_BUFMGR) if (INTEL_DEBUG & DEBUG_BUFMGR)
dri_bufmgr_set_debug(screen->bufmgr, true); dri_bufmgr_set_debug(screen->bufmgr, true);
if ((INTEL_DEBUG & DEBUG_SHADER_TIME) && screen->devinfo->gen < 7) { if ((INTEL_DEBUG & DEBUG_SHADER_TIME) && screen->devinfo.gen < 7) {
fprintf(stderr, fprintf(stderr,
"shader_time debugging requires gen7 (Ivybridge) or better.\n"); "shader_time debugging requires gen7 (Ivybridge) or better.\n");
INTEL_DEBUG &= ~DEBUG_SHADER_TIME; INTEL_DEBUG &= ~DEBUG_SHADER_TIME;
@@ -1632,10 +1631,10 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
screen->hw_has_timestamp = intel_detect_timestamp(screen); screen->hw_has_timestamp = intel_detect_timestamp(screen);
/* GENs prior to 8 do not support EU/Subslice info */ /* GENs prior to 8 do not support EU/Subslice info */
if (screen->devinfo->gen >= 8) { if (screen->devinfo.gen >= 8) {
intel_detect_sseu(screen); intel_detect_sseu(screen);
} else if (screen->devinfo->gen == 7) { } else if (screen->devinfo.gen == 7) {
screen->subslice_total = 1 << (screen->devinfo->gt - 1); screen->subslice_total = 1 << (screen->devinfo.gt - 1);
} }
const char *force_msaa = getenv("INTEL_FORCE_MSAA"); const char *force_msaa = getenv("INTEL_FORCE_MSAA");
@@ -1659,7 +1658,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
* *
* Don't even try on pre-Gen6, since we don't attempt to use contexts there. * Don't even try on pre-Gen6, since we don't attempt to use contexts there.
*/ */
if (screen->devinfo->gen >= 6) { if (screen->devinfo.gen >= 6) {
struct drm_i915_reset_stats stats; struct drm_i915_reset_stats stats;
memset(&stats, 0, sizeof(stats)); memset(&stats, 0, sizeof(stats));
@@ -1678,20 +1677,20 @@ __DRIconfig **intelInitScreen2(__DRIscreen *dri_screen)
* MI_MATH GPR registers, and version 7 in order to use * MI_MATH GPR registers, and version 7 in order to use
* MI_LOAD_REGISTER_REG (which all users of MI_MATH use). * MI_LOAD_REGISTER_REG (which all users of MI_MATH use).
*/ */
screen->has_mi_math_and_lrr = screen->devinfo->gen >= 8 || screen->has_mi_math_and_lrr = screen->devinfo.gen >= 8 ||
(screen->devinfo->is_haswell && (screen->devinfo.is_haswell &&
screen->cmd_parser_version >= 7); screen->cmd_parser_version >= 7);
dri_screen->extensions = !screen->has_context_reset_notification dri_screen->extensions = !screen->has_context_reset_notification
? screenExtensions : intelRobustScreenExtensions; ? screenExtensions : intelRobustScreenExtensions;
screen->compiler = brw_compiler_create(screen, screen->compiler = brw_compiler_create(screen,
screen->devinfo); &screen->devinfo);
screen->compiler->shader_debug_log = shader_debug_log_mesa; screen->compiler->shader_debug_log = shader_debug_log_mesa;
screen->compiler->shader_perf_log = shader_perf_log_mesa; screen->compiler->shader_perf_log = shader_perf_log_mesa;
screen->program_id = 1; screen->program_id = 1;
if (screen->devinfo->has_resource_streamer) { if (screen->devinfo.has_resource_streamer) {
screen->has_resource_streamer = screen->has_resource_streamer =
intel_get_boolean(screen, I915_PARAM_HAS_RESOURCE_STREAMER); intel_get_boolean(screen, I915_PARAM_HAS_RESOURCE_STREAMER);
} }

2
src/mesa/drivers/dri/i965/intel_screen.h
View File

@@ -40,7 +40,7 @@
struct intel_screen struct intel_screen
{ {
int deviceID; int deviceID;
const struct gen_device_info *devinfo; struct gen_device_info devinfo;
__DRIscreen *driScrnPriv; __DRIscreen *driScrnPriv;