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

nv50: remove some cruft, don't upload program unless really needed

Browse Source
This commit is contained in:
Ben Skeggs
2008-06-12 13:50:56 +10:00
parent ab3d55e2e3
commit f700d6be63
2 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nv50/nv50_program.c
+8 -1
View File
@@ -1484,10 +1484,13 @@ nv50_program_validate_code(struct nv50_context *nv50, struct nv50_program *p)
{
struct pipe_winsys *ws = nv50->pipe.winsys;
struct nv50_program_exec *e;
boolean upload = FALSE;
unsigned *map;
if (!p->buffer)
if (!p->buffer) {
p->buffer = ws->buffer_create(ws, 0x100, 0, p->exec_size * 4);
upload = TRUE;
}
if (p->data && p->data->start != p->data_start) {
for (e = p->exec_head; e; e = e->next) {
@@ -1503,8 +1506,12 @@ nv50_program_validate_code(struct nv50_context *nv50, struct nv50_program *p)
}
p->data_start = p->data->start;
upload = TRUE;
}
if (!upload)
return FALSE;
map = ws->buffer_map(ws, p->buffer, PIPE_BUFFER_USAGE_CPU_WRITE);
for (e = p->exec_head; e; e = e->next) {
#ifdef NV50_PROGRAM_DUMP
src/gallium/drivers/nv50/nv50_state_validate.c
+2 -31
View File
@@ -114,10 +114,10 @@ nv50_state_validate(struct nv50_context *nv50)
if (nv50->dirty & NV50_NEW_ZSA)
so_emit(nvws, nv50->zsa->so);
if (nv50->dirty & NV50_NEW_VERTPROG)
if (nv50->dirty & (NV50_NEW_VERTPROG | NV50_NEW_VERTPROG_CB))
nv50_vertprog_validate(nv50);
if (nv50->dirty & NV50_NEW_FRAGPROG)
if (nv50->dirty & (NV50_NEW_FRAGPROG | NV50_NEW_FRAGPROG_CB))
nv50_fragprog_validate(nv50);
if (nv50->dirty & NV50_NEW_RASTERIZER)
@@ -168,35 +168,6 @@ nv50_state_validate(struct nv50_context *nv50)
so_ref(NULL, &so);
}
if (nv50->dirty & NV50_NEW_VERTPROG_CB) {
so = so_new(4, 2);
so_method(so, tesla, 0x1280, 3);
so_reloc (so, nv50->constbuf[PIPE_SHADER_VERTEX], 0,
NOUVEAU_BO_HIGH | NOUVEAU_BO_RD | NOUVEAU_BO_VRAM,
0, 0);
so_reloc (so, nv50->constbuf[PIPE_SHADER_VERTEX], 0,
NOUVEAU_BO_LOW | NOUVEAU_BO_RD | NOUVEAU_BO_VRAM,
0, 0);
so_data (so, (NV50_CB_PVP << 16) | 0x1000);
so_emit(nvws, so);
so_ref(NULL, &so);
}
if (nv50->dirty & NV50_NEW_FRAGPROG_CB) {
so = so_new(4, 2);
so_method(so, tesla, 0x1280, 3);
so_reloc (so, nv50->constbuf[PIPE_SHADER_FRAGMENT], 0,
NOUVEAU_BO_HIGH | NOUVEAU_BO_RD | NOUVEAU_BO_VRAM,
0, 0);
so_reloc (so, nv50->constbuf[PIPE_SHADER_FRAGMENT], 0,
NOUVEAU_BO_LOW | NOUVEAU_BO_RD | NOUVEAU_BO_VRAM,
0, 0);
so_data (so, (NV50_CB_PFP << 16) | 0x1000);
so_emit(nvws, so);
so_ref(NULL, &so);
}
if (nv50->dirty & NV50_NEW_ARRAYS)
nv50_vbo_validate(nv50);