AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvc0: bind images on 3D shaders for Kepler

Browse Source 
Similar to surfaces validation for compute shaders.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Samuel Pitoiset
2016-04-05 13:53:56 +02:00
parent 1eca4c51a2
commit e28f247e24
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nouveau/nvc0/nvc0_program.c
+3 -1
View File
@@ -561,12 +561,14 @@ nvc0_program_translate(struct nvc0_program *prog, uint16_t chipset,
} else {
if (chipset >= NVISA_GK104_CHIPSET) {
info->io.texBindBase = NVC0_CB_AUX_TEX_INFO(0);
info->io.suInfoBase = NVC0_CB_AUX_SU_INFO(0);
} else {
info->io.suInfoBase = 0; /* TODO */
}
info->io.sampleInfoBase = NVC0_CB_AUX_SAMPLE_INFO;
info->io.bufInfoBase = NVC0_CB_AUX_BUF_INFO(0);
info->io.msInfoCBSlot = 15;
info->io.msInfoBase = 0; /* TODO */
info->io.suInfoBase = 0; /* TODO */
}
info->assignSlots = nvc0_program_assign_varying_slots;
src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
+28 -1
View File
@@ -911,7 +911,34 @@ nvc0_update_surface_bindings(struct nvc0_context *nvc0)
static inline void
nve4_update_surface_bindings(struct nvc0_context *nvc0)
{
/* TODO */
struct nouveau_pushbuf *push = nvc0->base.pushbuf;
struct nvc0_screen *screen = nvc0->screen;
int i, j, s;
for (s = 0; s < 5; s++) {
if (!nvc0->images_dirty[s])
continue;
BEGIN_NVC0(push, NVC0_3D(CB_SIZE), 3);
PUSH_DATA (push, 2048);
PUSH_DATAh(push, screen->uniform_bo->offset + NVC0_CB_AUX_INFO(s));
PUSH_DATA (push, screen->uniform_bo->offset + NVC0_CB_AUX_INFO(s));
BEGIN_1IC0(push, NVC0_3D(CB_POS), 1 + 16 * NVC0_MAX_IMAGES);
PUSH_DATA (push, NVC0_CB_AUX_SU_INFO(0));
for (i = 0; i < NVC0_MAX_IMAGES; ++i) {
struct pipe_image_view *view = &nvc0->images[s][i];
if (view->resource) {
struct nv04_resource *res = nv04_resource(view->resource);
nve4_set_surface_info(push, view, screen);
BCTX_REFN(nvc0->bufctx_3d, 3D_SUF, res, RDWR);
} else {
for (j = 0; j < 16; j++)
PUSH_DATA(push, 0);
}
}
}
}
void