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

iris: rename pipe to base

Browse Source
This commit is contained in:
Kenneth Graunke
2018-08-18 23:21:32 -07:00
parent 7705f62cb6
commit aba2cee711
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/iris/iris_resource.h
View File

@@ -57,7 +57,7 @@ struct iris_state_ref {
* depth/stencil attachment. * depth/stencil attachment.
*/ */
struct iris_surface { struct iris_surface {
struct pipe_surface pipe; struct pipe_surface base;
struct isl_view view; struct isl_view view;
/** The resource (BO) holding our SURFACE_STATE. */ /** The resource (BO) holding our SURFACE_STATE. */

18
src/gallium/drivers/iris/iris_state.c
View File

@@ -1185,7 +1185,7 @@ iris_bind_sampler_states(struct pipe_context *ctx,
*/ */
struct iris_sampler_view { struct iris_sampler_view {
// XXX: just store the resource, not the rest of this // XXX: just store the resource, not the rest of this
struct pipe_sampler_view pipe; struct pipe_sampler_view base;
struct isl_view view; struct isl_view view;
/** The resource (BO) holding our SURFACE_STATE. */ /** The resource (BO) holding our SURFACE_STATE. */
@@ -1226,11 +1226,11 @@ iris_create_sampler_view(struct pipe_context *ctx,
return NULL; return NULL;
/* initialize base object */ /* initialize base object */
isv->pipe = *tmpl; isv->base = *tmpl;
isv->pipe.context = ctx; isv->base.context = ctx;
isv->pipe.texture = NULL; isv->base.texture = NULL;
pipe_reference_init(&isv->pipe.reference, 1); pipe_reference_init(&isv->base.reference, 1);
pipe_resource_reference(&isv->pipe.texture, tex); pipe_resource_reference(&isv->base.texture, tex);
void *map = upload_state(ice->state.surface_uploader, &isv->surface_state, void *map = upload_state(ice->state.surface_uploader, &isv->surface_state,
4 * GENX(RENDER_SURFACE_STATE_length), 64); 4 * GENX(RENDER_SURFACE_STATE_length), 64);
@@ -1283,7 +1283,7 @@ iris_create_sampler_view(struct pipe_context *ctx,
.mocs = MOCS_WB); .mocs = MOCS_WB);
} }
return &isv->pipe; return &isv->base;
} }
static void static void
@@ -1311,7 +1311,7 @@ iris_create_surface(struct pipe_context *ctx,
struct iris_screen *screen = (struct iris_screen *)ctx->screen; struct iris_screen *screen = (struct iris_screen *)ctx->screen;
const struct gen_device_info *devinfo = &screen->devinfo; const struct gen_device_info *devinfo = &screen->devinfo;
struct iris_surface *surf = calloc(1, sizeof(struct iris_surface)); struct iris_surface *surf = calloc(1, sizeof(struct iris_surface));
struct pipe_surface *psurf = &surf->pipe; struct pipe_surface *psurf = &surf->base;
struct iris_resource *res = (struct iris_resource *) tex; struct iris_resource *res = (struct iris_resource *) tex;
if (!surf) if (!surf)
@@ -2967,7 +2967,7 @@ use_surface(struct iris_batch *batch,
static uint32_t static uint32_t
use_sampler_view(struct iris_batch *batch, struct iris_sampler_view *isv) use_sampler_view(struct iris_batch *batch, struct iris_sampler_view *isv)
{ {
iris_use_pinned_bo(batch, iris_resource_bo(isv->pipe.texture), false); iris_use_pinned_bo(batch, iris_resource_bo(isv->base.texture), false);
iris_use_pinned_bo(batch, iris_resource_bo(isv->surface_state.res), false); iris_use_pinned_bo(batch, iris_resource_bo(isv->surface_state.res), false);
return isv->surface_state.offset; return isv->surface_state.offset;