If you're worried about the duplication of some CAPs, we can remove them later. v2: add fields for memory eviction stats Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>tags/11.2-branchpoint
@@ -165,6 +165,7 @@ fd_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) | |||
case PIPE_CAP_TEXTURE_BARRIER: | |||
case PIPE_CAP_TEXTURE_MIRROR_CLAMP: | |||
case PIPE_CAP_COMPUTE: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_SM3: |
@@ -264,6 +264,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap cap) | |||
case PIPE_CAP_STRING_MARKER: | |||
case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: |
@@ -490,6 +490,7 @@ ilo_get_param(struct pipe_screen *screen, enum pipe_cap param) | |||
case PIPE_CAP_STRING_MARKER: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_VENDOR_ID: |
@@ -314,6 +314,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) | |||
case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
} | |||
/* should only get here on unhandled cases */ |
@@ -187,6 +187,7 @@ nv30_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) | |||
case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_VENDOR_ID: |
@@ -230,6 +230,7 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) | |||
case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_VENDOR_ID: |
@@ -220,6 +220,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) | |||
case PIPE_CAP_STRING_MARKER: | |||
case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_VENDOR_ID: |
@@ -213,6 +213,7 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param) | |||
case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
/* SWTCL-only features. */ |
@@ -369,6 +369,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) | |||
case PIPE_CAP_GENERATE_MIPMAP: | |||
case PIPE_CAP_STRING_MARKER: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: |
@@ -361,6 +361,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) | |||
case PIPE_CAP_GENERATE_MIPMAP: | |||
case PIPE_CAP_STRING_MARKER: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS: |
@@ -265,6 +265,7 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) | |||
case PIPE_CAP_STRING_MARKER: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
} | |||
/* should only get here on unhandled cases */ |
@@ -359,6 +359,7 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param) | |||
case PIPE_CAP_INVALIDATE_BUFFER: | |||
case PIPE_CAP_STRING_MARKER: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: | |||
return 64; |
@@ -202,6 +202,7 @@ vc4_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) | |||
case PIPE_CAP_STRING_MARKER: | |||
case PIPE_CAP_SURFACE_REINTERPRET_BLOCKS: | |||
case PIPE_CAP_QUERY_BUFFER_OBJECT: | |||
case PIPE_CAP_QUERY_MEMORY_INFO: | |||
return 0; | |||
/* Stream output. */ |
@@ -651,6 +651,7 @@ enum pipe_cap | |||
PIPE_CAP_STRING_MARKER, | |||
PIPE_CAP_SURFACE_REINTERPRET_BLOCKS, | |||
PIPE_CAP_QUERY_BUFFER_OBJECT, | |||
PIPE_CAP_QUERY_MEMORY_INFO, | |||
}; | |||
#define PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_NV50 (1 << 0) |
@@ -57,6 +57,7 @@ struct pipe_resource; | |||
struct pipe_surface; | |||
struct pipe_transfer; | |||
struct pipe_box; | |||
struct pipe_memory_info; | |||
/** | |||
@@ -260,6 +261,11 @@ struct pipe_screen { | |||
unsigned index, | |||
struct pipe_driver_query_group_info *info); | |||
/** | |||
* Query information about memory usage. | |||
*/ | |||
void (*query_memory_info)(struct pipe_screen *screen, | |||
struct pipe_memory_info *info); | |||
}; | |||
@@ -720,6 +720,19 @@ struct pipe_debug_callback | |||
void *data; | |||
}; | |||
/** | |||
* Information about memory usage. All sizes are in kilobytes. | |||
*/ | |||
struct pipe_memory_info | |||
{ | |||
unsigned total_device_memory; /**< size of device memory, e.g. VRAM */ | |||
unsigned avail_device_memory; /**< free device memory at the moment */ | |||
unsigned total_staging_memory; /**< size of staging memory, e.g. GART */ | |||
unsigned avail_staging_memory; /**< free staging memory at the moment */ | |||
unsigned device_memory_evicted; /**< size of memory evicted (monotonic counter) */ | |||
unsigned nr_device_memory_evictions; /**< # of evictions (monotonic counter) */ | |||
}; | |||
#ifdef __cplusplus | |||
} | |||
#endif |