diff options
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_state.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c index e0475bb3da..5f304ccab9 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_state.c +++ b/src/mesa/drivers/dri/nouveau/nv10_state.c @@ -41,14 +41,19 @@ static void nv10ViewportScale(nouveauContextPtr nmesa) GLuint h = ctx->Viewport.Height; GLfloat max_depth = (ctx->Viewport.Near + ctx->Viewport.Far) * 0.5; - switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) { - case 16: - max_depth *= 32767.0; - break; - case 24: - max_depth *= 16777215.0; - break; - } +/* if (ctx->DrawBuffer) { + switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) { + case 16: + max_depth *= 32767.0; + break; + case 24: + max_depth *= 16777215.0; + break; + } + } else {*/ + /* Default to 24 bits range */ + max_depth *= 16777215.0; +/* }*/ BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_SCALE_X, 4); OUT_RING_CACHEf ((((GLfloat) w) * 0.5) - 2048.0); @@ -123,25 +128,25 @@ static void nv10ClearDepth(GLcontext *ctx, GLclampd d) { nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx); - switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) { +/* switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) { case 16: nmesa->clear_value = (uint32_t)(d*0x7FFF); break; - case 24: + case 24:*/ nmesa->clear_value = ((nmesa->clear_value&0x000000FF) | (((uint32_t)(d*0xFFFFFF))<<8)); - break; - } +/* break; + }*/ } static void nv10ClearStencil(GLcontext *ctx, GLint s) { nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx); - if (ctx->DrawBuffer->_DepthBuffer->DepthBits == 24) { +/* if (ctx->DrawBuffer->_DepthBuffer->DepthBits == 24) {*/ nmesa->clear_value = ((nmesa->clear_value&0xFFFFFF00)| (s&0x000000FF)); - } +/* }*/ } static void nv10ClipPlane(GLcontext *ctx, GLenum plane, const GLfloat *equation) |