replace __inline and __inline__ with INLINE macro

[mesa.git] / src / mesa / drivers / dri / nouveau / nv04_state.c

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state.c b/src/mesa/drivers/dri/nouveau/nv04_state.c
index ec4cd40d877df93ff1d7b1a0de90b2cc0e0b3d4a..d3031aa5b197dc6eae48c9b90ff1618c32cc96da 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state.c
@@ -35,9 +35,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "mtypes.h"
 #include "colormac.h"
 
-static uint32_t nv04_compare_func(GLcontext *ctx,GLuint f)
+static uint32_t nv04_compare_func(GLuint f)
 {
-       switch ( ctx->Color.AlphaFunc ) {
+       switch ( f ) {
                case GL_NEVER:          return 1;
                case GL_LESS:           return 2;
                case GL_EQUAL:          return 3;
@@ -51,9 +51,9 @@ static uint32_t nv04_compare_func(GLcontext *ctx,GLuint f)
        return 0;
 }
 
-static uint32_t nv04_blend_func(GLcontext *ctx,GLuint f)
+static uint32_t nv04_blend_func(GLuint f)
 {
-       switch ( ctx->Color.AlphaFunc ) {
+       switch ( f ) {
                case GL_ZERO:                   return 0x1;
                case GL_ONE:                    return 0x2;
                case GL_SRC_COLOR:              return 0x3;
@@ -66,7 +66,7 @@ static uint32_t nv04_blend_func(GLcontext *ctx,GLuint f)
                case GL_ONE_MINUS_DST_COLOR:    return 0xA;
                case GL_SRC_ALPHA_SATURATE:     return 0xB;
        }
-       WARN_ONCE("Unable to find the function\n");
+       WARN_ONCE("Unable to find the function 0x%x\n",f);
        return 0;
 }
 
@@ -78,11 +78,11 @@ static void nv04_emit_control(GLcontext *ctx)
 
        CLAMPED_FLOAT_TO_UBYTE(alpha_ref, ctx->Color.AlphaRef);
        control=alpha_ref;
-       control|=(nv04_compare_func(ctx,ctx->Color.AlphaFunc)<<8);
+       control|=(nv04_compare_func(ctx->Color.AlphaFunc)<<8);
        control|=(ctx->Color.AlphaEnabled<<12);
        control|=(1<<13);
        control|=(ctx->Depth.Test<<14);
-       control|=(nv04_compare_func(ctx,ctx->Depth.Func)<<16);
+       control|=(nv04_compare_func(ctx->Depth.Func)<<16);
        if ((ctx->Polygon.CullFlag)&&(ctx->Polygon.CullFaceMode!=GL_FRONT_AND_BACK))
        {
                if ((ctx->Polygon.FrontFace==GL_CW)&&(ctx->Polygon.CullFaceMode==GL_FRONT))
@@ -126,8 +126,8 @@ static void nv04_emit_blend(GLcontext *ctx)
                blend|=(1<<8);
        blend|=(ctx->Fog.Enabled<<16);
        blend|=(ctx->Color.BlendEnabled<<20);
-       blend|=(nv04_blend_func(ctx,ctx->Color.BlendSrcRGB)<<24);
-       blend|=(nv04_blend_func(ctx,ctx->Color.BlendDstRGB)<<28);
+       blend|=(nv04_blend_func(ctx->Color.BlendSrcRGB)<<24);
+       blend|=(nv04_blend_func(ctx->Color.BlendDstRGB)<<28);
 
        BEGIN_RING_CACHE(NvSub3D, NV04_DX5_TEXTURED_TRIANGLE_BLEND, 1);
        OUT_RING_CACHE(blend);
@@ -451,39 +451,41 @@ static GLboolean nv04InitCard(nouveauContextPtr nmesa)
 
 /* Update buffer offset/pitch/format */
 static GLboolean nv04BindBuffers(nouveauContextPtr nmesa, int num_color,
-               nouveau_renderbuffer **color,
-               nouveau_renderbuffer *depth)
+               nouveau_renderbuffer_t **color,
+               nouveau_renderbuffer_t *depth)
 {
        GLuint x, y, w, h;
+       uint32_t depth_pitch=(depth?depth->pitch:0+15)&~15+16;
+       if (depth_pitch<256) depth_pitch=256;
 
        w = color[0]->mesa.Width;
        h = color[0]->mesa.Height;
        x = nmesa->drawX;
        y = nmesa->drawY;
 
+       BEGIN_RING_SIZE(NvSubCtxSurf3D, NV04_CONTEXT_SURFACES_3D_FORMAT, 1);
+       if (color[0]->mesa._ActualFormat == GL_RGBA8)
+               OUT_RING(0x108/*A8R8G8B8*/);
+       else
+               OUT_RING(0x103/*R5G6B5*/);
+
        /* FIXME pitches have to be aligned ! */
        BEGIN_RING_SIZE(NvSubCtxSurf3D, NV04_CONTEXT_SURFACES_3D_PITCH, 2);
-       OUT_RING(color[0]->pitch|(depth->pitch<<16));
+       OUT_RING(color[0]->pitch|(depth_pitch<<16));
        OUT_RING(color[0]->offset);
-
        if (depth) {
                BEGIN_RING_SIZE(NvSubCtxSurf3D, NV04_CONTEXT_SURFACES_3D_OFFSET_ZETA, 1);
                OUT_RING(depth->offset);
        }
 
-       BEGIN_RING_SIZE(NvSubCtxSurf3D, NV04_CONTEXT_SURFACES_3D_CLIP_HORIZONTAL, 2);
-       OUT_RING((w<<16)|x);
-       OUT_RING((h<<16)|y);
+//     BEGIN_RING_SIZE(NvSubCtxSurf3D, NV04_CONTEXT_SURFACES_3D_CLIP_HORIZONTAL, 2);
+//     OUT_RING((w<<16)|x);
+//     OUT_RING((h<<16)|y);
 
-       /* FIXME not sure... */
-       BEGIN_RING_SIZE(NvSubCtxSurf3D, NV04_CONTEXT_SURFACES_3D_CLIP_SIZE, 1);
-       OUT_RING((h<<16)|w);
 
-       BEGIN_RING_SIZE(NvSubCtxSurf3D, NV04_CONTEXT_SURFACES_3D_FORMAT, 1);
-       if (color[0]->mesa._ActualFormat == GL_RGBA8)
-               OUT_RING(108/*A8R8G8B8*/);
-       else
-               OUT_RING(103/*R5G6B5*/);
+       /* FIXME not sure... */
+/*     BEGIN_RING_SIZE(NvSubCtxSurf3D, NV04_CONTEXT_SURFACES_3D_CLIP_SIZE, 1);
+       OUT_RING((h<<16)|w);*/
 
        return GL_TRUE;
 }