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

intel/blorp: Expand blorp_address::offset to be 64 bits.

Browse Source 
In the softpin world, surface state base address may be a fixed 64-bit
address (with no associated BO).  It makes sense to store this in the
offset field.  But it needs to be the full size.

We also update the clear color address to be consistently uint64_t
everywhere so we can continue passing intel_miptree_get_clear_color
a pointer to the blorp_address's offset field without type mismatches.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Kenneth Graunke
2018-04-21 00:06:29 -07:00
parent d014af98b7
commit f0d51e81c9
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/blorp/blorp.h
View File

@@ -91,8 +91,8 @@ void blorp_batch_finish(struct blorp_batch *batch);
struct blorp_address { struct blorp_address {
void *buffer; void *buffer;
uint64_t offset;
unsigned reloc_flags; unsigned reloc_flags;
uint32_t offset;
uint32_t mocs; uint32_t mocs;
}; };

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

@@ -156,7 +156,7 @@ brw_emit_surface_state(struct brw_context *brw,
struct isl_surf *aux_surf = NULL; struct isl_surf *aux_surf = NULL;
uint64_t aux_offset = 0; uint64_t aux_offset = 0;
struct brw_bo *clear_bo = NULL; struct brw_bo *clear_bo = NULL;
uint32_t clear_offset = 0; uint64_t clear_offset = 0;
if (aux_usage != ISL_AUX_USAGE_NONE) { if (aux_usage != ISL_AUX_USAGE_NONE) {
aux_surf = &mt->aux_buf->surf; aux_surf = &mt->aux_buf->surf;

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

@@ -3865,7 +3865,7 @@ intel_miptree_get_clear_color(const struct gen_device_info *devinfo,
const struct intel_mipmap_tree *mt, const struct intel_mipmap_tree *mt,
enum isl_format view_format, bool sampling, enum isl_format view_format, bool sampling,
struct brw_bo **clear_color_bo, struct brw_bo **clear_color_bo,
uint32_t *clear_color_offset) uint64_t *clear_color_offset)
{ {
assert(mt->aux_buf); assert(mt->aux_buf);

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

@@ -714,7 +714,7 @@ intel_miptree_get_clear_color(const struct gen_device_info *devinfo,
const struct intel_mipmap_tree *mt, const struct intel_mipmap_tree *mt,
enum isl_format view_format, bool sampling, enum isl_format view_format, bool sampling,
struct brw_bo **clear_color_bo, struct brw_bo **clear_color_bo,
uint32_t *clear_color_offset); uint64_t *clear_color_offset);
static inline int static inline int