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

gallium: extend resource_get_param to be as capable as resource_get_handle

Browse Source 
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Marek Olšák
2019-08-29 20:35:54 -04:00
parent aae35fbd3a
commit d307aa56f9
7 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/auxiliary/driver_ddebug/dd_screen.c
View File

@@ -313,14 +313,19 @@ dd_screen_resource_get_handle(struct pipe_screen *_screen,
static bool
dd_screen_resource_get_param(struct pipe_screen *_screen,
struct pipe_context *_pipe,
struct pipe_resource *resource,
unsigned int plane,
unsigned plane,
unsigned layer,
enum pipe_resource_param param,
unsigned handle_usage,
uint64_t *value)
{
struct pipe_screen *screen = dd_screen(_screen)->screen;
struct pipe_context *pipe = _pipe ? dd_context(_pipe)->pipe : NULL;
return screen->resource_get_param(screen, resource, plane, param, value);
return screen->resource_get_param(screen, pipe, resource, plane, layer,
param, handle_usage, value);
}
static void

8
src/gallium/auxiliary/driver_noop/noop_pipe.c
View File

@@ -157,9 +157,12 @@ static bool noop_resource_get_handle(struct pipe_screen *pscreen,
}
static bool noop_resource_get_param(struct pipe_screen *pscreen,
struct pipe_context *ctx,
struct pipe_resource *resource,
unsigned int plane,
unsigned plane,
unsigned layer,
enum pipe_resource_param param,
unsigned handle_usage,
uint64_t *value)
{
struct noop_pipe_screen *noop_screen = (struct noop_pipe_screen*)pscreen;
@@ -172,7 +175,8 @@ static bool noop_resource_get_param(struct pipe_screen *pscreen,
if (!tex)
return false;
result = screen->resource_get_param(screen, tex, 0, param, value);
result = screen->resource_get_param(screen, NULL, tex, 0, 0, param,
handle_usage, value);
pipe_resource_reference(&tex, NULL);
return result;
}

10
src/gallium/auxiliary/driver_rbug/rbug_screen.c
View File

@@ -217,17 +217,23 @@ rbug_screen_resource_get_handle(struct pipe_screen *_screen,
static bool
rbug_screen_resource_get_param(struct pipe_screen *_screen,
struct pipe_context *_pipe,
struct pipe_resource *_resource,
unsigned int plane,
unsigned plane,
unsigned layer,
enum pipe_resource_param param,
unsigned handle_usage,
uint64_t *value)
{
struct rbug_screen *rb_screen = rbug_screen(_screen);
struct rbug_context *rb_pipe = rbug_context(_pipe);
struct rbug_resource *rb_resource = rbug_resource(_resource);
struct pipe_screen *screen = rb_screen->screen;
struct pipe_resource *resource = rb_resource->resource;
return screen->resource_get_param(screen, resource, plane, param, value);
return screen->resource_get_param(screen, rb_pipe ? rb_pipe->pipe : NULL,
resource, plane, layer, param,
handle_usage, value);
}

10
src/gallium/auxiliary/driver_trace/tr_screen.c
View File

@@ -409,17 +409,23 @@ trace_screen_resource_get_handle(struct pipe_screen *_screen,
static bool
trace_screen_resource_get_param(struct pipe_screen *_screen,
struct pipe_context *_pipe,
struct pipe_resource *resource,
unsigned int plane,
unsigned plane,
unsigned layer,
enum pipe_resource_param param,
unsigned handle_usage,
uint64_t *value)
{
struct trace_screen *tr_screen = trace_screen(_screen);
struct trace_context *tr_pipe = _pipe ? trace_context(_pipe) : NULL;
struct pipe_screen *screen = tr_screen->screen;
/* TODO trace call */
return screen->resource_get_param(screen, resource, plane, param, value);
return screen->resource_get_param(screen, tr_pipe ? tr_pipe->pipe : NULL,
resource, plane, layer, param,
handle_usage, value);
}
static void

5
src/gallium/drivers/iris/iris_resource.c
View File

@@ -1025,9 +1025,12 @@ iris_flush_resource(struct pipe_context *ctx, struct pipe_resource *resource)
static bool
iris_resource_get_param(struct pipe_screen *screen,
struct pipe_context *context,
struct pipe_resource *resource,
unsigned int plane,
unsigned plane,
unsigned layer,
enum pipe_resource_param param,
unsigned handle_usage,
uint64_t *value)
{
struct iris_resource *res = (struct iris_resource *)resource;

11
src/gallium/include/pipe/p_screen.h
View File

@@ -265,11 +265,20 @@ struct pipe_screen {
/**
* Get info for the given pipe resource without the need to get a
* winsys_handle.
*
* The context parameter can optionally be used to flush the resource and
* the context to make sure the resource is coherent with whatever user
* will use it. Some drivers may also use the context to convert
* the resource into a format compatible for sharing. The context parameter
* is allowed to be NULL.
*/
bool (*resource_get_param)(struct pipe_screen *screen,
struct pipe_context *context,
struct pipe_resource *resource,
unsigned int plane,
unsigned plane,
unsigned layer,
enum pipe_resource_param param,
unsigned handle_usage,
uint64_t *value);
/**

19
src/gallium/state_trackers/dri/dri2.c
View File

@@ -1146,14 +1146,15 @@ dri2_query_image_by_resource_handle(__DRIimage *image, int attrib, int *value)
static bool
dri2_resource_get_param(__DRIimage *image, enum pipe_resource_param param,
uint64_t *value)
unsigned handle_usage, uint64_t *value)
{
struct pipe_screen *pscreen = image->texture->screen;
if (!pscreen->resource_get_param)
return false;
return pscreen->resource_get_param(pscreen, image->texture, image->plane,
param, value);
return pscreen->resource_get_param(pscreen, NULL, image->texture,
image->plane, 0, param, handle_usage,
value);
}
static bool
@@ -1161,6 +1162,7 @@ dri2_query_image_by_resource_param(__DRIimage *image, int attrib, int *value)
{
enum pipe_resource_param param;
uint64_t res_param;
unsigned handle_usage;
if (!image->texture->screen->resource_get_param)
return false;
@@ -1192,7 +1194,12 @@ dri2_query_image_by_resource_param(__DRIimage *image, int attrib, int *value)
return false;
}
if (!dri2_resource_get_param(image, param, &res_param))
if (image->use & __DRI_IMAGE_USE_BACKBUFFER)
handle_usage = PIPE_HANDLE_USAGE_EXPLICIT_FLUSH;
else
handle_usage = PIPE_HANDLE_USAGE_FRAMEBUFFER_WRITE;
if (!dri2_resource_get_param(image, param, handle_usage, &res_param))
return false;
switch (attrib) {
@@ -1330,7 +1337,7 @@ dri2_from_planar(__DRIimage *image, int plane, void *loaderPrivate)
return NULL;
} else if (plane > 0) {
uint64_t planes;
if (!dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_NPLANES,
if (!dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_NPLANES, 0,
&planes) ||
plane >= planes) {
return NULL;
@@ -1339,7 +1346,7 @@ dri2_from_planar(__DRIimage *image, int plane, void *loaderPrivate)
if (image->dri_components == 0) {
uint64_t modifier;
if (!dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_MODIFIER,
if (!dri2_resource_get_param(image, PIPE_RESOURCE_PARAM_MODIFIER, 0,
&modifier) ||
modifier == DRM_FORMAT_MOD_INVALID) {
return NULL;