radv: Only save the descriptor set if we have one.

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

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
index 316ee2abe6a280e556b02265e1fdffb75d65b20c..d741d416673428bebd3bf04f7524cf176144851a 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state_tex.c
@@ -39,7 +39,8 @@ nv10_emit_tex_gen(struct gl_context *ctx, int emit)
        const int i = emit - NOUVEAU_STATE_TEX_GEN0;
        struct nouveau_context *nctx = to_nouveau_context(ctx);
        struct nouveau_pushbuf *push = context_push(ctx);
-       struct gl_texture_unit *unit = &ctx->Texture.Unit[i];
+       struct gl_fixedfunc_texture_unit *unit =
+           &ctx->Texture.FixedFuncUnit[i];
        int j;
 
        for (j = 0; j < 4; j++) {
@@ -73,7 +74,7 @@ nv10_emit_tex_mat(struct gl_context *ctx, int emit)
 
        if (nctx->fallback == HWTNL &&
            ((ctx->Texture._TexMatEnabled & 1 << i) ||
-            ctx->Texture.Unit[i]._GenFlags)) {
+            ctx->Texture.FixedFuncUnit[i]._GenFlags)) {
                BEGIN_NV04(push, NV10_3D(TEX_MATRIX_ENABLE(i)), 1);
                PUSH_DATA (push, 1);
 
@@ -96,13 +97,13 @@ get_tex_format_pot(struct gl_texture_image *ti)
        case MESA_FORMAT_B8G8R8X8_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_X8R8G8B8;
 
-       case MESA_FORMAT_ARGB1555:
+       case MESA_FORMAT_B5G5R5A1_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_A1R5G5B5;
 
-       case MESA_FORMAT_ARGB4444:
+       case MESA_FORMAT_B4G4R4A4_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_A4R4G4B4;
 
-       case MESA_FORMAT_RGB565:
+       case MESA_FORMAT_B5G6R5_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_R5G6B5;
 
        case MESA_FORMAT_A_UNORM8:
@@ -131,10 +132,10 @@ static uint32_t
 get_tex_format_rect(struct gl_texture_image *ti)
 {
        switch (ti->TexFormat) {
-       case MESA_FORMAT_ARGB1555:
+       case MESA_FORMAT_B5G5R5A1_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_A1R5G5B5_RECT;
 
-       case MESA_FORMAT_RGB565:
+       case MESA_FORMAT_B5G6R5_UNORM:
                return NV10_3D_TEX_FORMAT_FORMAT_R5G6B5_RECT;
 
        case MESA_FORMAT_B8G8R8A8_UNORM:
@@ -165,7 +166,7 @@ nv10_emit_tex_obj(struct gl_context *ctx, int emit)
 
        PUSH_RESET(push, BUFCTX_TEX(i));
 
-       if (!ctx->Texture.Unit[i]._ReallyEnabled) {
+       if (!ctx->Texture.Unit[i]._Current) {
                BEGIN_NV04(push, NV10_3D(TEX_ENABLE(i)), 1);
                PUSH_DATA (push, 0);
                return;