fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nvc0: fixes for program tessellation parameters

Browse source
This commit is contained in:
Christoph Bumiller 2011-10-17 23:30:02 +02:00
parent 8bc3a87f40
commit 44c23e9052
2 changed files with 47 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/drivers/nv50/codegen/nv50_ir_driver.h
View file

@ -68,6 +68,25 @@ struct nv50_ir_varying
# define NV50_IR_DEBUG_REG_ALLOC 0 # define NV50_IR_DEBUG_REG_ALLOC 0
#endif #endif
#define NV50_SEMANTIC_CLIPDISTANCE (TGSI_SEMANTIC_COUNT + 0)
#define NV50_SEMANTIC_TEXCOORD (TGSI_SEMANTIC_COUNT + 1)
#define NV50_SEMANTIC_POINTCOORD (TGSI_SEMANTIC_COUNT + 2)
#define NV50_SEMANTIC_VERTEXID (TGSI_SEMANTIC_COUNT + 3)
#define NV50_SEMANTIC_VIEWPORTINDEX (TGSI_SEMANTIC_COUNT + 4)
#define NV50_SEMANTIC_LAYER (TGSI_SEMANTIC_COUNT + 5)
#define NV50_SEMANTIC_INVOCATIONID (TGSI_SEMANTIC_COUNT + 6)
#define NV50_SEMANTIC_TESSFACTOR (TGSI_SEMANTIC_COUNT + 7)
#define NV50_SEMANTIC_TESSCOORD (TGSI_SEMANTIC_COUNT + 8)
#define NV50_SEMANTIC_SAMPLEMASK (TGSI_SEMANTIC_COUNT + 9)
#define NV50_SEMANTIC_COUNT (TGSI_SEMANTIC_COUNT + 10)
#define NV50_TESS_PART_FRACT_ODD 0
#define NV50_TESS_PART_FRACT_EVEN 1
#define NV50_TESS_PART_POW2 2
#define NV50_TESS_PART_INTEGER 3
#define NV50_PRIM_PATCHES PIPE_PRIM_MAX
struct nv50_ir_prog_info struct nv50_ir_prog_info
{ {
uint16_t target; /* chipset (0x50, 0x84, 0xc0, ...) */ uint16_t target; /* chipset (0x50, 0x84, 0xc0, ...) */

45
src/gallium/drivers/nvc0/nvc0_program.c
View file

@ -51,7 +51,7 @@ static uint32_t
nvc0_shader_input_address(unsigned sn, unsigned si, unsigned ubase) nvc0_shader_input_address(unsigned sn, unsigned si, unsigned ubase)
{ {
switch (sn) { switch (sn) {
/* case TGSI_SEMANTIC_TESSFACTOR: return 0x000 + si * 0x4; */ case NV50_SEMANTIC_TESSFACTOR: return 0x000 + si * 0x4;
case TGSI_SEMANTIC_PRIMID: return 0x060; case TGSI_SEMANTIC_PRIMID: return 0x060;
case TGSI_SEMANTIC_PSIZE: return 0x06c; case TGSI_SEMANTIC_PSIZE: return 0x06c;
case TGSI_SEMANTIC_POSITION: return 0x070; case TGSI_SEMANTIC_POSITION: return 0x070;
@ -59,14 +59,14 @@ nvc0_shader_input_address(unsigned sn, unsigned si, unsigned ubase)
case TGSI_SEMANTIC_FOG: return 0x270; case TGSI_SEMANTIC_FOG: return 0x270;
case TGSI_SEMANTIC_COLOR: return 0x280 + si * 0x10; case TGSI_SEMANTIC_COLOR: return 0x280 + si * 0x10;
case TGSI_SEMANTIC_BCOLOR: return 0x2a0 + si * 0x10; case TGSI_SEMANTIC_BCOLOR: return 0x2a0 + si * 0x10;
/* case TGSI_SEMANTIC_CLIP: return 0x2c0 + si * 0x10; */ case NV50_SEMANTIC_CLIPDISTANCE: return 0x2c0 + si * 0x10;
/* case TGSI_SEMANTIC_POINTCOORD: return 0x2e0; */ case NV50_SEMANTIC_POINTCOORD: return 0x2e0;
/* case TGSI_SEMANTIC_TESSCOORD: return ~0; */ /* 0x2f0, but special load */ case NV50_SEMANTIC_TESSCOORD: return 0x2f0;
case TGSI_SEMANTIC_INSTANCEID: return 0x2f8; case TGSI_SEMANTIC_INSTANCEID: return 0x2f8;
/* case TGSI_SEMANTIC_VERTEXID: return 0x2fc; */ case NV50_SEMANTIC_VERTEXID: return 0x2fc;
/* case TGSI_SEMANTIC_TEXCOORD: return 0x300 + si * 0x10; */ case NV50_SEMANTIC_TEXCOORD: return 0x300 + si * 0x10;
case TGSI_SEMANTIC_FACE: return 0x3fc; case TGSI_SEMANTIC_FACE: return 0x3fc;
/* case TGSI_SEMANTIC_INVOCATIONID: return ~0; */ case NV50_SEMANTIC_INVOCATIONID: return ~0;
default: default:
assert(!"invalid TGSI input semantic"); assert(!"invalid TGSI input semantic");
return ~0; return ~0;
@ -77,18 +77,18 @@ static uint32_t
nvc0_shader_output_address(unsigned sn, unsigned si, unsigned ubase) nvc0_shader_output_address(unsigned sn, unsigned si, unsigned ubase)
{ {
switch (sn) { switch (sn) {
/* case TGSI_SEMANTIC_TESSFACTOR: return 0x000 + si * 0x4; */ case NV50_SEMANTIC_TESSFACTOR: return 0x000 + si * 0x4;
case TGSI_SEMANTIC_PRIMID: return 0x040; case TGSI_SEMANTIC_PRIMID: return 0x040;
/* case TGSI_SEMANTIC_LAYER: return 0x064; */ case NV50_SEMANTIC_LAYER: return 0x064;
/* case TGSI_SEMANTIC_VIEWPORTINDEX: return 0x068; */ case NV50_SEMANTIC_VIEWPORTINDEX: return 0x068;
case TGSI_SEMANTIC_PSIZE: return 0x06c; case TGSI_SEMANTIC_PSIZE: return 0x06c;
case TGSI_SEMANTIC_POSITION: return 0x070; case TGSI_SEMANTIC_POSITION: return 0x070;
case TGSI_SEMANTIC_GENERIC: return ubase + si * 0x10; case TGSI_SEMANTIC_GENERIC: return ubase + si * 0x10;
case TGSI_SEMANTIC_FOG: return 0x270; case TGSI_SEMANTIC_FOG: return 0x270;
case TGSI_SEMANTIC_COLOR: return 0x280 + si * 0x10; case TGSI_SEMANTIC_COLOR: return 0x280 + si * 0x10;
case TGSI_SEMANTIC_BCOLOR: return 0x2a0 + si * 0x10; case TGSI_SEMANTIC_BCOLOR: return 0x2a0 + si * 0x10;
/* case TGSI_SEMANTIC_CLIP: return 0x2c0 + si * 0x10; */ case NV50_SEMANTIC_CLIPDISTANCE: return 0x2c0 + si * 0x10;
/* case TGSI_SEMANTIC_TEXCOORD: return 0x300 + si * 0x10; */ case NV50_SEMANTIC_TEXCOORD: return 0x300 + si * 0x10;
case TGSI_SEMANTIC_EDGEFLAG: return ~0; case TGSI_SEMANTIC_EDGEFLAG: return ~0;
default: default:
assert(!"invalid TGSI output semantic"); assert(!"invalid TGSI output semantic");
@ -121,6 +121,9 @@ nvc0_sp_assign_input_slots(struct nv50_ir_prog_info *info)
if (info->in[i].patch && offset >= 0x20) if (info->in[i].patch && offset >= 0x20)
offset = 0x20 + info->in[i].si * 0x10; offset = 0x20 + info->in[i].si * 0x10;
if (info->in[i].sn == NV50_SEMANTIC_TESSCOORD)
info->in[i].mask &= 3;
for (c = 0; c < 4; ++c) for (c = 0; c < 4; ++c)
info->in[i].slot[c] = (offset + c * 0x4) / 4; info->in[i].slot[c] = (offset + c * 0x4) / 4;
@ -214,8 +217,12 @@ nvc0_vtgp_gen_header(struct nvc0_program *vp, struct nv50_ir_prog_info *info)
continue; continue;
for (c = 0; c < 4; ++c) { for (c = 0; c < 4; ++c) {
a = info->in[i].slot[c]; a = info->in[i].slot[c];
if (info->in[i].mask & (1 << c)) if (info->in[i].mask & (1 << c)) {
vp->hdr[5 + a / 32] |= 1 << (a % 32); if (info->in[i].sn != NV50_SEMANTIC_TESSCOORD)
vp->hdr[5 + a / 32] |= 1 << (a % 32);
else
nvc0_vtgp_hdr_update_oread(vp, info->in[i].slot[c]);
}
} }
} }
@ -241,11 +248,9 @@ nvc0_vtgp_gen_header(struct nvc0_program *vp, struct nv50_ir_prog_info *info)
case TGSI_SEMANTIC_INSTANCEID: case TGSI_SEMANTIC_INSTANCEID:
vp->hdr[10] |= 1 << 30; vp->hdr[10] |= 1 << 30;
break; break;
/* case NV50_SEMANTIC_VERTEXID:
case TGSI_SEMANTIC_VERTEXID:
vp->hdr[10] |= 1 << 31; vp->hdr[10] |= 1 << 31;
break; break;
*/
default: default:
break; break;
} }
@ -269,6 +274,10 @@ nvc0_vp_gen_header(struct nvc0_program *vp, struct nv50_ir_prog_info *info)
static void static void
nvc0_tp_get_tess_mode(struct nvc0_program *tp, struct nv50_ir_prog_info *info) nvc0_tp_get_tess_mode(struct nvc0_program *tp, struct nv50_ir_prog_info *info)
{ {
if (info->prop.tp.outputPrim == PIPE_PRIM_MAX) {
tp->tp.tess_mode = ~0;
return;
}
switch (info->prop.tp.domain) { switch (info->prop.tp.domain) {
case PIPE_PRIM_LINES: case PIPE_PRIM_LINES:
tp->tp.tess_mode = NVC0_3D_TESS_MODE_PRIM_ISOLINES; tp->tp.tess_mode = NVC0_3D_TESS_MODE_PRIM_ISOLINES;
@ -336,6 +345,8 @@ nvc0_tcp_gen_header(struct nvc0_program *tcp, struct nv50_ir_prog_info *info)
static int static int
nvc0_tep_gen_header(struct nvc0_program *tep, struct nv50_ir_prog_info *info) nvc0_tep_gen_header(struct nvc0_program *tep, struct nv50_ir_prog_info *info)
{ {
tep->tp.input_patch_size = ~0;
tep->hdr[0] = 0x20061 | (3 << 10); tep->hdr[0] = 0x20061 | (3 << 10);
tep->hdr[4] = 0xff000; tep->hdr[4] = 0xff000;