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

[i915] Pass static region names in so debugging says more than "static region".

Browse Source
This commit is contained in:
Eric Anholt
2007-11-16 16:14:42 -08:00
parent 5ef6803b7a
commit 9b461d4d02
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesa/drivers/dri/intel/intel_regions.c
View File

@@ -147,6 +147,7 @@ intel_region_release(struct intel_region **region)
struct intel_region * struct intel_region *
intel_region_create_static(intelScreenPrivate *intelScreen, intel_region_create_static(intelScreenPrivate *intelScreen,
const char *name,
GLuint mem_type, GLuint mem_type,
unsigned int bo_handle, unsigned int bo_handle,
GLuint offset, GLuint offset,
@@ -164,11 +165,11 @@ intel_region_create_static(intelScreenPrivate *intelScreen,
if (intelScreen->ttm) { if (intelScreen->ttm) {
assert(bo_handle != -1); assert(bo_handle != -1);
region->buffer = intel_ttm_bo_create_from_handle(intelScreen->bufmgr, region->buffer = intel_ttm_bo_create_from_handle(intelScreen->bufmgr,
"static region", name,
bo_handle); bo_handle);
} else { } else {
region->buffer = dri_bo_alloc_static(intelScreen->bufmgr, region->buffer = dri_bo_alloc_static(intelScreen->bufmgr,
"static region", name,
offset, pitch * cpp * height, offset, pitch * cpp * height,
virtual, virtual,
DRM_BO_FLAG_MEM_TT); DRM_BO_FLAG_MEM_TT);
@@ -182,6 +183,7 @@ intel_region_create_static(intelScreenPrivate *intelScreen,
void void
intel_region_update_static(intelScreenPrivate *intelScreen, intel_region_update_static(intelScreenPrivate *intelScreen,
struct intel_region *region, struct intel_region *region,
const char *name,
GLuint mem_type, GLuint mem_type,
unsigned int bo_handle, unsigned int bo_handle,
GLuint offset, GLuint offset,
@@ -203,11 +205,11 @@ intel_region_update_static(intelScreenPrivate *intelScreen,
if (intelScreen->ttm) { if (intelScreen->ttm) {
assert(bo_handle != -1); assert(bo_handle != -1);
region->buffer = intel_ttm_bo_create_from_handle(intelScreen->bufmgr, region->buffer = intel_ttm_bo_create_from_handle(intelScreen->bufmgr,
"static region", name,
bo_handle); bo_handle);
} else { } else {
region->buffer = dri_bo_alloc_static(intelScreen->bufmgr, region->buffer = dri_bo_alloc_static(intelScreen->bufmgr,
"static region", name,
offset, pitch * cpp * height, offset, pitch * cpp * height,
virtual, virtual,
DRM_BO_FLAG_MEM_TT); DRM_BO_FLAG_MEM_TT);

2
src/mesa/drivers/dri/intel/intel_regions.h
View File

@@ -72,6 +72,7 @@ void intel_region_release(struct intel_region **ib);
extern struct intel_region extern struct intel_region
*intel_region_create_static(intelScreenPrivate *intelScreen, *intel_region_create_static(intelScreenPrivate *intelScreen,
const char *name,
GLuint mem_type, GLuint mem_type,
unsigned int bo_handle, unsigned int bo_handle,
GLuint offset, GLuint offset,
@@ -81,6 +82,7 @@ extern struct intel_region
extern void extern void
intel_region_update_static(intelScreenPrivate *intelScreen, intel_region_update_static(intelScreenPrivate *intelScreen,
struct intel_region *region, struct intel_region *region,
const char *name,
GLuint mem_type, GLuint mem_type,
unsigned int bo_handle, unsigned int bo_handle,
GLuint offset, GLuint offset,

13
src/mesa/drivers/dri/intel/intel_screen.c
View File

@@ -172,18 +172,19 @@ intel_fence_wait(void *private, unsigned int cookie)
static struct intel_region * static struct intel_region *
intel_recreate_static(intelScreenPrivate *intelScreen, intel_recreate_static(intelScreenPrivate *intelScreen,
const char *name,
struct intel_region *region, struct intel_region *region,
intelRegion *region_desc, intelRegion *region_desc,
GLuint mem_type) GLuint mem_type)
{ {
if (region) { if (region) {
intel_region_update_static(intelScreen, region, mem_type, intel_region_update_static(intelScreen, region, name, mem_type,
region_desc->bo_handle, region_desc->offset, region_desc->bo_handle, region_desc->offset,
region_desc->map, intelScreen->cpp, region_desc->map, intelScreen->cpp,
region_desc->pitch / intelScreen->cpp, region_desc->pitch / intelScreen->cpp,
intelScreen->height); intelScreen->height);
} else { } else {
region = intel_region_create_static(intelScreen, mem_type, region = intel_region_create_static(intelScreen, name, mem_type,
region_desc->bo_handle, region_desc->bo_handle,
region_desc->offset, region_desc->offset,
region_desc->map, intelScreen->cpp, region_desc->map, intelScreen->cpp,
@@ -211,20 +212,20 @@ static void
intel_recreate_static_regions(intelScreenPrivate *intelScreen) intel_recreate_static_regions(intelScreenPrivate *intelScreen)
{ {
intelScreen->front_region = intelScreen->front_region =
intel_recreate_static(intelScreen, intel_recreate_static(intelScreen, "front",
intelScreen->front_region, intelScreen->front_region,
&intelScreen->front, &intelScreen->front,
DRM_BO_FLAG_MEM_TT); DRM_BO_FLAG_MEM_TT);
intelScreen->back_region = intelScreen->back_region =
intel_recreate_static(intelScreen, intel_recreate_static(intelScreen, "back",
intelScreen->back_region, intelScreen->back_region,
&intelScreen->back, &intelScreen->back,
DRM_BO_FLAG_MEM_TT); DRM_BO_FLAG_MEM_TT);
if (intelScreen->third.handle) { if (intelScreen->third.handle) {
intelScreen->third_region = intelScreen->third_region =
intel_recreate_static(intelScreen, intel_recreate_static(intelScreen, "third",
intelScreen->third_region, intelScreen->third_region,
&intelScreen->third, &intelScreen->third,
DRM_BO_FLAG_MEM_TT); DRM_BO_FLAG_MEM_TT);
@@ -234,7 +235,7 @@ intel_recreate_static_regions(intelScreenPrivate *intelScreen)
* private buffers. * private buffers.
*/ */
intelScreen->depth_region = intelScreen->depth_region =
intel_recreate_static(intelScreen, intel_recreate_static(intelScreen, "depth",
intelScreen->depth_region, intelScreen->depth_region,
&intelScreen->depth, &intelScreen->depth,
DRM_BO_FLAG_MEM_TT); DRM_BO_FLAG_MEM_TT);