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

nv50: turn on depth test/write again, not 100% but winsys handles it better

Browse Source
This commit is contained in:
Ben Skeggs
2008-06-25 03:56:57 +10:00
parent 47771bcd2f
commit 5a3362521d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nv50/nv50_miptree.c
+4 -3
View File
@@ -10,7 +10,7 @@ nv50_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
{
struct pipe_winsys *ws = pscreen->winsys;
struct nv50_miptree *mt = CALLOC_STRUCT(nv50_miptree);
unsigned usage;
unsigned usage, pitch;
NOUVEAU_ERR("unimplemented\n");
@@ -28,8 +28,9 @@ nv50_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
break;
}
mt->buffer = ws->buffer_create(ws, 256, usage,
pt->width[0] * pt->cpp * pt->height[0]);
pitch = ((pt->width[0] + 63) & ~63) * pt->cpp;
mt->buffer = ws->buffer_create(ws, 256, usage, pitch * pt->height[0]);
if (!mt->buffer) {
FREE(mt);
return NULL;
src/gallium/drivers/nv50/nv50_state.c
+2 -2
View File
@@ -272,10 +272,10 @@ nv50_depth_stencil_alpha_state_create(struct pipe_context *pipe,
struct nouveau_stateobj *so = so_new(64, 0);
so_method(so, tesla, NV50TCL_DEPTH_WRITE_ENABLE, 1);
so_data (so, 0); //cso->depth.writemask ? 1 : 0);
so_data (so, cso->depth.writemask ? 1 : 0);
if (cso->depth.enabled) {
so_method(so, tesla, NV50TCL_DEPTH_TEST_ENABLE, 1);
so_data (so, 0); //1);
so_data (so, 1);
so_method(so, tesla, NV50TCL_DEPTH_TEST_FUNC, 1);
so_data (so, nvgl_comparison_op(cso->depth.func));
} else {