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

nouveau: more nv30 fixes, still doesn't work as well as before.

Browse Source
This commit is contained in:
Stephane Marchesin
2008-02-15 04:23:46 +01:00
parent 01fccea190
commit 0a653bef05
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configs/linux-dri
+1 -1
View File
@@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
# gamma are missing because they have not been converted to use the new
# interface.
DRI_DIRS = intel_winsys nouveau_winsys
DRI_DIRS = nouveau_winsys
src/mesa/pipe/nv30/nv30_context.c
+2
View File
@@ -71,6 +71,8 @@ nv30_get_paramf(struct pipe_context *pipe, int param)
return 16.0;
case PIPE_CAP_MAX_TEXTURE_LOD_BIAS:
return 4.0;
case PIPE_CAP_BITMAP_TEXCOORD_BIAS:
return 0.0;
default:
NOUVEAU_ERR("Unknown PIPE_CAP %d\n", param);
return 0.0;
src/mesa/pipe/nv30/nv30_state.c
+2 -6
View File
@@ -614,12 +614,8 @@ nv30_set_framebuffer_state(struct pipe_context *pipe,
nv30->rt[1] = rt[1]->buffer;
}
if (zeta_format) {
/* XXX allocate LMA */
/* BEGIN_RING(rankine, NV34TCL_LMA_DEPTH_OFFSET, 1);
OUT_RING(0);*/
BEGIN_RING(rankine, NV34TCL_ZETA_PITCH, 1);
OUT_RING (zeta->pitch * zeta->cpp);
if (zeta_format)
{
nv30->zeta = zeta->buffer;
}
src/mesa/pipe/nv30/nv30_vbo.c
+4 -4
View File
@@ -241,9 +241,9 @@ nv30_draw_elements_u08(struct nv30_context *nv30, void *ib,
}
while (count) {
push = MIN2(count, 2046);
push = MIN2(count, 2047 * 2);
BEGIN_RING_NI(rankine, NV40TCL_VB_ELEMENT_U16, push);
BEGIN_RING_NI(rankine, NV40TCL_VB_ELEMENT_U16, push >> 1);
for (i = 0; i < push; i+=2)
OUT_RING((elts[i+1] << 16) | elts[i]);
@@ -266,9 +266,9 @@ nv30_draw_elements_u16(struct nv30_context *nv30, void *ib,
}
while (count) {
push = MIN2(count, 2046);
push = MIN2(count, 2047 * 2);
BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U16, push);
BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U16, push >> 1);
for (i = 0; i < push; i+=2)
OUT_RING((elts[i+1] << 16) | elts[i]);