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

nouveau: unhardcode some more NV30TCL_FP_CONTROL values

Browse Source
This commit is contained in:
Ben Skeggs
2007-01-29 16:39:19 +11:00
parent aa397fe472
commit 0c5b42a991
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/nouveau/nouveau_shader.h
+2 -1
View File
@@ -26,7 +26,8 @@ typedef struct _nvs_fragment_header {
typedef union {
struct {
uint32_t fp_control;
GLboolean uses_kil;
GLuint num_regs;
} NV30FP;
struct {
uint32_t vp_in_reg;
src/mesa/drivers/dri/nouveau/nv30_fragprog.c
+17 -3
View File
@@ -24,6 +24,7 @@ static void
NV30FPUploadToHW(GLcontext *ctx, nouveauShader *nvs)
{
nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
nvsCardPriv *priv = &nvs->card_priv;
uint32_t offset;
if (!nvs->program_buffer)
@@ -46,8 +47,9 @@ NV30FPUploadToHW(GLcontext *ctx, nouveauShader *nvs)
*/
BEGIN_RING_SIZE(NvSub3D, NV30_TCL_PRIMITIVE_3D_FP_ACTIVE_PROGRAM, 1);
OUT_RING (offset | 1);
BEGIN_RING_SIZE(NvSub3D, 0x1d60, 1);
OUT_RING (nvs->card_priv.NV30FP.fp_control | 0x03000000);
BEGIN_RING_SIZE(NvSub3D, 0x1d60 /*NV30_TCL_PRIMITIVE_3D_FP_CONTROL*/, 1);
OUT_RING ((priv->NV30FP.uses_kil << 7) |
(priv->NV30FP.num_regs << 24));
}
static void
@@ -95,7 +97,7 @@ static void
NV30FPSetOpcode(nvsFunc *shader, unsigned int opcode, int slot)
{
if (opcode == NV30_FP_OP_OPCODE_KIL)
shader->card_priv->NV30FP.fp_control |= (1<<7);
shader->card_priv->NV30FP.uses_kil = GL_TRUE;
shader->inst[0] &= ~NV30_FP_OP_OPCODE_MASK;
shader->inst[0] |= (opcode << NV30_FP_OP_OPCODE_SHIFT);
}
@@ -145,6 +147,16 @@ NV30FPSetCondition(nvsFunc *shader, int on, nvsCond cond, int reg,
shader->inst[1] |= (swz[NVS_SWZ_W] << NV30_FP_OP_COND_SWZ_W_SHIFT);
}
static void
NV30FPSetHighReg(nvsFunc *shader, int id)
{
if (shader->card_priv->NV30FP.num_regs < (id+1)) {
if (id == 0)
id = 1; /* necessary? */
shader->card_priv->NV30FP.num_regs = (id+1);
}
}
static void
NV30FPSetResult(nvsFunc *shader, nvsRegister *reg, unsigned int mask, int slot)
{
@@ -163,6 +175,7 @@ NV30FPSetResult(nvsFunc *shader, nvsRegister *reg, unsigned int mask, int slot)
shader->inst[0] &= ~NV30_FP_OP_UNK0_7;
hwreg = reg->index;
}
NV30FPSetHighReg(shader, hwreg);
shader->inst[0] &= ~NV30_FP_OP_OUT_REG_SHIFT;
shader->inst[0] |= (hwreg << NV30_FP_OP_OUT_REG_SHIFT);
}
@@ -176,6 +189,7 @@ NV30FPSetSource(nvsFunc *shader, nvsRegister *reg, int pos)
case NVS_FILE_TEMP:
hwsrc |= (NV30_FP_REG_TYPE_TEMP << NV30_FP_REG_TYPE_SHIFT);
hwsrc |= (reg->index << NV30_FP_REG_SRC_SHIFT);
NV30FPSetHighReg(shader, reg->index);
break;
case NVS_FILE_ATTRIB:
{